josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-07-19 02:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add protobuf transport and refactor to support (#24)

Browse source
This commit is contained in:
Josh Thomas 2024-12-11 20:28:57 -06:00 • committed by GitHub
parent b3e0ee7b6e
commit 643a47953e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 406 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/djls-python/src/packaging.rs
View file

@ -1,4 +1,4 @@
use djls_ipc::{parse_json_response, JsonResponse, PythonProcess, TransportError};
use djls_ipc::{JsonResponse, PythonProcess, TransportError, TransportMessage, TransportResponse};
use serde::Deserialize;
use std::collections::HashMap;
use std::fmt;
@ -78,10 +78,18 @@ impl ImportCheck {
python: &mut PythonProcess,
modules: Option<Vec<String>>,
) -> Result<bool, PackagingError> {
let response = python.send("has_import", modules)?;
let response = parse_json_response(response)?;
let check = Self::try_from(response)?;
Ok(check.can_import)
let message = TransportMessage::Json("has_import".to_string());
let response = python.send(message, modules)?;
match response {
TransportResponse::Json(json_str) => {
let json_response: JsonResponse = serde_json::from_str(&json_str)?;
let check = Self::try_from(json_response)?;
Ok(check.can_import)
}
_ => Err(PackagingError::Transport(TransportError::Process(
"Unexpected response type".to_string(),
))),
}
}
}

16
crates/djls-python/src/python.rs
View file

@ -1,5 +1,5 @@
use crate::packaging::{Packages, PackagingError};
use djls_ipc::{parse_json_response, JsonResponse, PythonProcess, TransportError};
use djls_ipc::{JsonResponse, PythonProcess, TransportError, TransportMessage, TransportResponse};
use serde::Deserialize;
use std::fmt;
use std::path::PathBuf;
@ -72,9 +72,17 @@ impl TryFrom<JsonResponse> for Python {
impl Python {
pub fn setup(python: &mut PythonProcess) -> Result<Self, PythonError> {
let response = python.send("python_setup", None)?;
let response = parse_json_response(response)?;
Ok(Self::try_from(response)?)
let message = TransportMessage::Json("python_setup".to_string());
let response = python.send(message, None)?;
match response {
TransportResponse::Json(json_str) => {
let json_response: JsonResponse = serde_json::from_str(&json_str)?;
Ok(Self::try_from(json_response)?)
}
_ => Err(PythonError::Transport(TransportError::Process(
"Unexpected response type".to_string(),
))),
}
}
}