diff --git a/.editorconfig b/.editorconfig index e5da04a..2dd1d44 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,14 +9,14 @@ trim_trailing_whitespace = true [{,.}{j,J}ustfile] indent_size = 4 -[*.{just,proto,py,rst,ini,md}] +[*.{just,py,rst,ini,md}] indent_size = 4 [*.py] line_length = 120 multi_line_output = 3 -[*.{css,html,js,json,jsx,sass,scss,svelte,ts,tsx,yml,yaml}] +[*.{css,html,js,json,jsx,proto,sass,scss,svelte,ts,tsx,yml,yaml}] indent_size = 2 [*.md] diff --git a/crates/djls-django/src/django.rs b/crates/djls-django/src/django.rs index 4947212..8475637 100644 --- a/crates/djls-django/src/django.rs +++ b/crates/djls-django/src/django.rs @@ -23,7 +23,7 @@ impl DjangoProject { pub fn setup(mut python: PythonProcess) -> Result { let py = Python::setup(&mut python)?; - match check::GeoDjangoPrereqsRequest::execute(&mut python)?.result { + match commands::check::GeoDjangoPrereqsRequest::execute(&mut python)?.result { Some(messages::response::Result::CheckGeodjangoPrereqs(response)) => { if !response.passed { eprintln!("Warning: GeoDjango detected but GDAL is not available."); @@ -43,7 +43,7 @@ impl DjangoProject { _ => Err(ProcessError::Response)?, } - let response = django::GetProjectInfoRequest::execute(&mut python)?; + let response = commands::django::GetProjectInfoRequest::execute(&mut python)?; let version = match response.result { Some(messages::response::Result::DjangoGetProjectInfo(response)) => { diff --git a/crates/djls-ipc/src/commands.rs b/crates/djls-ipc/src/commands.rs index 3fac6ac..4fb6f91 100644 --- a/crates/djls-ipc/src/commands.rs +++ b/crates/djls-ipc/src/commands.rs @@ -13,7 +13,7 @@ pub trait IpcCommand: Default { } } -impl IpcCommand for v1::check::HealthRequest { +impl IpcCommand for v1::commands::check::HealthRequest { fn into_request(&self) -> messages::Request { messages::Request { command: Some(messages::request::Command::CheckHealth(*self)), @@ -29,7 +29,7 @@ impl IpcCommand for v1::check::HealthRequest { } } -impl IpcCommand for v1::check::GeoDjangoPrereqsRequest { +impl IpcCommand for v1::commands::check::GeoDjangoPrereqsRequest { fn into_request(&self) -> messages::Request { messages::Request { command: Some(messages::request::Command::CheckGeodjangoPrereqs(*self)), @@ -45,7 +45,7 @@ impl IpcCommand for v1::check::GeoDjangoPrereqsRequest { } } -impl IpcCommand for v1::python::GetEnvironmentRequest { +impl IpcCommand for v1::commands::python::GetEnvironmentRequest { fn into_request(&self) -> messages::Request { messages::Request { command: Some(messages::request::Command::PythonGetEnvironment(*self)), @@ -61,7 +61,7 @@ impl IpcCommand for v1::python::GetEnvironmentRequest { } } -impl IpcCommand for v1::django::GetProjectInfoRequest { +impl IpcCommand for v1::commands::django::GetProjectInfoRequest { fn into_request(&self) -> messages::Request { messages::Request { command: Some(messages::request::Command::DjangoGetProjectInfo(*self)), diff --git a/crates/djls-ipc/src/process.rs b/crates/djls-ipc/src/process.rs index f317f15..08b0833 100644 --- a/crates/djls-ipc/src/process.rs +++ b/crates/djls-ipc/src/process.rs @@ -79,7 +79,7 @@ impl PythonProcess { ) -> Result<(), ProcessError> { let request = messages::Request { command: Some(messages::request::Command::CheckHealth( - check::HealthRequest {}, + commands::check::HealthRequest {}, )), }; diff --git a/crates/djls-ipc/src/proto.rs b/crates/djls-ipc/src/proto.rs index 1be4bc9..96112a9 100644 --- a/crates/djls-ipc/src/proto.rs +++ b/crates/djls-ipc/src/proto.rs @@ -1,16 +1,16 @@ pub mod v1 { - pub mod messages { - include!(concat!(env!("OUT_DIR"), "/djls.v1.messages.rs")); - } - - pub mod check { - include!(concat!(env!("OUT_DIR"), "/djls.v1.check.rs")); + pub mod commands { + include!(concat!(env!("OUT_DIR"), "/djls.v1.commands.rs")); } pub mod django { include!(concat!(env!("OUT_DIR"), "/djls.v1.django.rs")); } + pub mod messages { + include!(concat!(env!("OUT_DIR"), "/djls.v1.messages.rs")); + } + pub mod python { include!(concat!(env!("OUT_DIR"), "/djls.v1.python.rs")); } diff --git a/crates/djls-python/src/python.rs b/crates/djls-python/src/python.rs index 5ecfbfc..c7563a7 100644 --- a/crates/djls-python/src/python.rs +++ b/crates/djls-python/src/python.rs @@ -91,7 +91,7 @@ pub struct Python { impl Python { pub fn setup(python: &mut PythonProcess) -> Result { - let response = python::GetEnvironmentRequest::execute(python)?; + let response = commands::python::GetEnvironmentRequest::execute(python)?; match response.result { Some(messages::response::Result::PythonGetEnvironment(response)) => response .python diff --git a/proto/v1/check.proto b/proto/v1/check.proto deleted file mode 100644 index 270e5dd..0000000 --- a/proto/v1/check.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -package djls.v1.check; - -message HealthRequest {} -message HealthResponse { - bool passed = 1; - optional string error = 2; -} - -message GeoDjangoPrereqsRequest {} -message GeoDjangoPrereqsResponse { - bool passed = 1; - optional string error = 2; -} diff --git a/proto/v1/commands.proto b/proto/v1/commands.proto new file mode 100644 index 0000000..3a5c0ee --- /dev/null +++ b/proto/v1/commands.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; + +package djls.v1.commands; + +import "v1/django.proto"; +import "v1/python.proto"; + +message Check { + message HealthRequest {} + message HealthResponse { + bool passed = 1; + optional string error = 2; + } + + message GeoDjangoPrereqsRequest {} + message GeoDjangoPrereqsResponse { + bool passed = 1; + optional string error = 2; + } +} + +message Python { + message GetEnvironmentRequest {} + message GetEnvironmentResponse { + python.Python python = 1; + } +} + +message Django { + message GetProjectInfoRequest {} + message GetProjectInfoResponse { + django.Project project = 1; + } +} + diff --git a/proto/v1/django.proto b/proto/v1/django.proto index 27c24da..1e01599 100644 --- a/proto/v1/django.proto +++ b/proto/v1/django.proto @@ -2,14 +2,6 @@ syntax = "proto3"; package djls.v1.django; -// models message Project { string version = 3; } - -// commands -message GetProjectInfoRequest {} - -message GetProjectInfoResponse { - Project project = 1; -} diff --git a/proto/v1/messages.proto b/proto/v1/messages.proto index 91821db..692470b 100644 --- a/proto/v1/messages.proto +++ b/proto/v1/messages.proto @@ -2,25 +2,23 @@ syntax = "proto3"; package djls.v1.messages; -import "v1/check.proto"; -import "v1/django.proto"; -import "v1/python.proto"; +import "v1/commands.proto"; message Request { oneof command { - check.HealthRequest check__health = 1; - check.GeoDjangoPrereqsRequest check__geodjango_prereqs = 2; - python.GetEnvironmentRequest python__get_environment = 1000; - django.GetProjectInfoRequest django__get_project_info = 2000; + commands.Check.HealthRequest check__health = 1; + commands.Check.GeoDjangoPrereqsRequest check__geodjango_prereqs = 2; + commands.Python.GetEnvironmentRequest python__get_environment = 1000; + commands.Django.GetProjectInfoRequest django__get_project_info = 2000; } } message Response { oneof result { - check.HealthResponse check__health = 1; - check.GeoDjangoPrereqsResponse check__geodjango_prereqs = 2; - python.GetEnvironmentResponse python__get_environment = 1000; - django.GetProjectInfoResponse django__get_project_info = 2000; + commands.Check.HealthResponse check__health = 1; + commands.Check.GeoDjangoPrereqsResponse check__geodjango_prereqs = 2; + commands.Python.GetEnvironmentResponse python__get_environment = 1000; + commands.Django.GetProjectInfoResponse django__get_project_info = 2000; Error error = 9000; } } diff --git a/proto/v1/python.proto b/proto/v1/python.proto index 6cb23c0..88dd76e 100644 --- a/proto/v1/python.proto +++ b/proto/v1/python.proto @@ -71,10 +71,3 @@ message Package { repeated string dist_requires = 6; optional string dist_requires_python = 7; } - -// commands -message GetEnvironmentRequest {} - -message GetEnvironmentResponse { - Python python = 1; -} diff --git a/python/djls/handlers.py b/python/djls/handlers.py index 84c2b1f..12e2d60 100644 --- a/python/djls/handlers.py +++ b/python/djls/handlers.py @@ -19,7 +19,7 @@ import django from django.apps import apps from google.protobuf.message import Message -from .proto.v1 import check_pb2 +from .proto.v1 import commands_pb2 from .proto.v1 import django_pb2 from .proto.v1 import messages_pb2 from .proto.v1 import python_pb2 @@ -87,15 +87,17 @@ def proto_handler( return decorator -@proto_handler(check_pb2.HealthRequest) -async def check__health(_request: check_pb2.HealthRequest) -> check_pb2.HealthResponse: - return check_pb2.HealthResponse(passed=True) +@proto_handler(commands_pb2.Check.HealthRequest) +async def check__health( + _request: commands_pb2.Check.HealthRequest, +) -> commands_pb2.Check.HealthResponse: + return commands_pb2.Check.HealthResponse(passed=True) -@proto_handler(check_pb2.GeoDjangoPrereqsRequest) +@proto_handler(commands_pb2.Check.GeoDjangoPrereqsRequest) async def check__geodjango_prereqs( - request: check_pb2.GeoDjangoPrereqsRequest, -) -> check_pb2.GeoDjangoPrereqsResponse: + request: commands_pb2.Check.GeoDjangoPrereqsRequest, +) -> commands_pb2.Check.GeoDjangoPrereqsResponse: has_geodjango = apps.is_installed("django.contrib.gis") try: @@ -106,15 +108,15 @@ async def check__geodjango_prereqs( except FileNotFoundError: gdal_is_installed = False - return check_pb2.GeoDjangoPrereqsResponse( + return commands_pb2.Check.GeoDjangoPrereqsResponse( passed=(not has_geodjango) or gdal_is_installed ) -@proto_handler(python_pb2.GetEnvironmentRequest) +@proto_handler(commands_pb2.Python.GetEnvironmentRequest) async def python__get_environment( - _request: python_pb2.GetEnvironmentRequest, -) -> python_pb2.GetEnvironmentResponse: + _request: commands_pb2.Python.GetEnvironmentRequest, +) -> commands_pb2.Python.GetEnvironmentResponse: packages = {} for dist in importlib.metadata.distributions(): try: @@ -158,7 +160,7 @@ async def python__get_environment( serial=sys.version_info.serial, ) - return python_pb2.GetEnvironmentResponse( + return commands_pb2.Python.GetEnvironmentResponse( python=python_pb2.Python( os=python_pb2.Os(environ={k: v for k, v in os.environ.items()}), site=python_pb2.Site(packages=packages), @@ -193,10 +195,10 @@ async def python__get_environment( ) -@proto_handler(django_pb2.GetProjectInfoRequest) +@proto_handler(commands_pb2.Django.GetProjectInfoRequest) async def django__get_project_info( - _request: django_pb2.GetProjectInfoRequest, -) -> django_pb2.GetProjectInfoResponse: - return django_pb2.GetProjectInfoResponse( + _request: commands_pb2.Django.GetProjectInfoRequest, +) -> commands_pb2.Django.GetProjectInfoResponse: + return commands_pb2.Django.GetProjectInfoResponse( project=django_pb2.Project(version=django.__version__) ) diff --git a/python/djls/proto/v1/check_pb2.py b/python/djls/proto/v1/check_pb2.py deleted file mode 100644 index 1dce023..0000000 --- a/python/djls/proto/v1/check_pb2.py +++ /dev/null @@ -1,46 +0,0 @@ -# WARNING: This file is generated by protobuf. DO NOT EDIT! -# Any changes made to this file will be overwritten when the protobuf files are regenerated. -# Source: v1/check.proto - -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE -# source: v1/check.proto -# Protobuf Python Version: 5.29.1 -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version -from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 1, - '', - 'v1/check.proto' -) -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ev1/check.proto\x12\rdjls.v1.check\"\x0f\n\rHealthRequest\">\n\x0eHealthResponse\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\x05\x65rror\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\"\x19\n\x17GeoDjangoPrereqsRequest\"H\n\x18GeoDjangoPrereqsResponse\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\x05\x65rror\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_errorb\x06proto3') - -_globals = globals() -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'v1.check_pb2', _globals) -if not _descriptor._USE_C_DESCRIPTORS: - DESCRIPTOR._loaded_options = None - _globals['_HEALTHREQUEST']._serialized_start=33 - _globals['_HEALTHREQUEST']._serialized_end=48 - _globals['_HEALTHRESPONSE']._serialized_start=50 - _globals['_HEALTHRESPONSE']._serialized_end=112 - _globals['_GEODJANGOPREREQSREQUEST']._serialized_start=114 - _globals['_GEODJANGOPREREQSREQUEST']._serialized_end=139 - _globals['_GEODJANGOPREREQSRESPONSE']._serialized_start=141 - _globals['_GEODJANGOPREREQSRESPONSE']._serialized_end=213 -# @@protoc_insertion_point(module_scope) diff --git a/python/djls/proto/v1/check_pb2.pyi b/python/djls/proto/v1/check_pb2.pyi deleted file mode 100644 index eb0188a..0000000 --- a/python/djls/proto/v1/check_pb2.pyi +++ /dev/null @@ -1,33 +0,0 @@ -# WARNING: This file is generated by protobuf. DO NOT EDIT! -# Any changes made to this file will be overwritten when the protobuf files are regenerated. -# Source: v1/check.proto - -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Optional as _Optional - -DESCRIPTOR: _descriptor.FileDescriptor - -class HealthRequest(_message.Message): - __slots__ = () - def __init__(self) -> None: ... - -class HealthResponse(_message.Message): - __slots__ = ("passed", "error") - PASSED_FIELD_NUMBER: _ClassVar[int] - ERROR_FIELD_NUMBER: _ClassVar[int] - passed: bool - error: str - def __init__(self, passed: bool = ..., error: _Optional[str] = ...) -> None: ... - -class GeoDjangoPrereqsRequest(_message.Message): - __slots__ = () - def __init__(self) -> None: ... - -class GeoDjangoPrereqsResponse(_message.Message): - __slots__ = ("passed", "error") - PASSED_FIELD_NUMBER: _ClassVar[int] - ERROR_FIELD_NUMBER: _ClassVar[int] - passed: bool - error: str - def __init__(self, passed: bool = ..., error: _Optional[str] = ...) -> None: ... diff --git a/python/djls/proto/v1/commands_pb2.py b/python/djls/proto/v1/commands_pb2.py new file mode 100644 index 0000000..4814d83 --- /dev/null +++ b/python/djls/proto/v1/commands_pb2.py @@ -0,0 +1,62 @@ +# WARNING: This file is generated by protobuf. DO NOT EDIT! +# Any changes made to this file will be overwritten when the protobuf files are regenerated. +# Source: v1/commands.proto + +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE +# source: v1/commands.proto +# Protobuf Python Version: 5.29.1 +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version +from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 1, + '', + 'v1/commands.proto' +) +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +from . import django_pb2 as v1_dot_django__pb2 +from . import python_pb2 as v1_dot_python__pb2 + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11v1/commands.proto\x12\x10\x64jls.v1.commands\x1a\x0fv1/django.proto\x1a\x0fv1/python.proto\"\xbd\x01\n\x05\x43heck\x1a\x0f\n\rHealthRequest\x1a>\n\x0eHealthResponse\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\x05\x65rror\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\x1a\x19\n\x17GeoDjangoPrereqsRequest\x1aH\n\x18GeoDjangoPrereqsResponse\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\x05\x65rror\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x08\n\x06_error\"c\n\x06Python\x1a\x17\n\x15GetEnvironmentRequest\x1a@\n\x16GetEnvironmentResponse\x12&\n\x06python\x18\x01 \x01(\x0b\x32\x16.djls.v1.python.Python\"e\n\x06\x44jango\x1a\x17\n\x15GetProjectInfoRequest\x1a\x42\n\x16GetProjectInfoResponse\x12(\n\x07project\x18\x01 \x01(\x0b\x32\x17.djls.v1.django.Projectb\x06proto3') + +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'v1.commands_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_CHECK']._serialized_start=74 + _globals['_CHECK']._serialized_end=263 + _globals['_CHECK_HEALTHREQUEST']._serialized_start=83 + _globals['_CHECK_HEALTHREQUEST']._serialized_end=98 + _globals['_CHECK_HEALTHRESPONSE']._serialized_start=100 + _globals['_CHECK_HEALTHRESPONSE']._serialized_end=162 + _globals['_CHECK_GEODJANGOPREREQSREQUEST']._serialized_start=164 + _globals['_CHECK_GEODJANGOPREREQSREQUEST']._serialized_end=189 + _globals['_CHECK_GEODJANGOPREREQSRESPONSE']._serialized_start=191 + _globals['_CHECK_GEODJANGOPREREQSRESPONSE']._serialized_end=263 + _globals['_PYTHON']._serialized_start=265 + _globals['_PYTHON']._serialized_end=364 + _globals['_PYTHON_GETENVIRONMENTREQUEST']._serialized_start=275 + _globals['_PYTHON_GETENVIRONMENTREQUEST']._serialized_end=298 + _globals['_PYTHON_GETENVIRONMENTRESPONSE']._serialized_start=300 + _globals['_PYTHON_GETENVIRONMENTRESPONSE']._serialized_end=364 + _globals['_DJANGO']._serialized_start=366 + _globals['_DJANGO']._serialized_end=467 + _globals['_DJANGO_GETPROJECTINFOREQUEST']._serialized_start=376 + _globals['_DJANGO_GETPROJECTINFOREQUEST']._serialized_end=399 + _globals['_DJANGO_GETPROJECTINFORESPONSE']._serialized_start=401 + _globals['_DJANGO_GETPROJECTINFORESPONSE']._serialized_end=467 +# @@protoc_insertion_point(module_scope) diff --git a/python/djls/proto/v1/commands_pb2.pyi b/python/djls/proto/v1/commands_pb2.pyi new file mode 100644 index 0000000..3b8935e --- /dev/null +++ b/python/djls/proto/v1/commands_pb2.pyi @@ -0,0 +1,59 @@ +# WARNING: This file is generated by protobuf. DO NOT EDIT! +# Any changes made to this file will be overwritten when the protobuf files are regenerated. +# Source: v1/commands.proto + +from . import django_pb2 as _django_pb2 +from . import python_pb2 as _python_pb2 +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union + +DESCRIPTOR: _descriptor.FileDescriptor + +class Check(_message.Message): + __slots__ = () + class HealthRequest(_message.Message): + __slots__ = () + def __init__(self) -> None: ... + class HealthResponse(_message.Message): + __slots__ = ("passed", "error") + PASSED_FIELD_NUMBER: _ClassVar[int] + ERROR_FIELD_NUMBER: _ClassVar[int] + passed: bool + error: str + def __init__(self, passed: bool = ..., error: _Optional[str] = ...) -> None: ... + class GeoDjangoPrereqsRequest(_message.Message): + __slots__ = () + def __init__(self) -> None: ... + class GeoDjangoPrereqsResponse(_message.Message): + __slots__ = ("passed", "error") + PASSED_FIELD_NUMBER: _ClassVar[int] + ERROR_FIELD_NUMBER: _ClassVar[int] + passed: bool + error: str + def __init__(self, passed: bool = ..., error: _Optional[str] = ...) -> None: ... + def __init__(self) -> None: ... + +class Python(_message.Message): + __slots__ = () + class GetEnvironmentRequest(_message.Message): + __slots__ = () + def __init__(self) -> None: ... + class GetEnvironmentResponse(_message.Message): + __slots__ = ("python",) + PYTHON_FIELD_NUMBER: _ClassVar[int] + python: _python_pb2.Python + def __init__(self, python: _Optional[_Union[_python_pb2.Python, _Mapping]] = ...) -> None: ... + def __init__(self) -> None: ... + +class Django(_message.Message): + __slots__ = () + class GetProjectInfoRequest(_message.Message): + __slots__ = () + def __init__(self) -> None: ... + class GetProjectInfoResponse(_message.Message): + __slots__ = ("project",) + PROJECT_FIELD_NUMBER: _ClassVar[int] + project: _django_pb2.Project + def __init__(self, project: _Optional[_Union[_django_pb2.Project, _Mapping]] = ...) -> None: ... + def __init__(self) -> None: ... diff --git a/python/djls/proto/v1/django_pb2.py b/python/djls/proto/v1/django_pb2.py index 1e798d1..8d60c04 100644 --- a/python/djls/proto/v1/django_pb2.py +++ b/python/djls/proto/v1/django_pb2.py @@ -28,7 +28,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fv1/django.proto\x12\x0e\x64jls.v1.django\"\x1a\n\x07Project\x12\x0f\n\x07version\x18\x03 \x01(\t\"\x17\n\x15GetProjectInfoRequest\"B\n\x16GetProjectInfoResponse\x12(\n\x07project\x18\x01 \x01(\x0b\x32\x17.djls.v1.django.Projectb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fv1/django.proto\x12\x0e\x64jls.v1.django\"\x1a\n\x07Project\x12\x0f\n\x07version\x18\x03 \x01(\tb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,8 +37,4 @@ if not _descriptor._USE_C_DESCRIPTORS: DESCRIPTOR._loaded_options = None _globals['_PROJECT']._serialized_start=35 _globals['_PROJECT']._serialized_end=61 - _globals['_GETPROJECTINFOREQUEST']._serialized_start=63 - _globals['_GETPROJECTINFOREQUEST']._serialized_end=86 - _globals['_GETPROJECTINFORESPONSE']._serialized_start=88 - _globals['_GETPROJECTINFORESPONSE']._serialized_end=154 # @@protoc_insertion_point(module_scope) diff --git a/python/djls/proto/v1/django_pb2.pyi b/python/djls/proto/v1/django_pb2.pyi index e4a5fc8..433a580 100644 --- a/python/djls/proto/v1/django_pb2.pyi +++ b/python/djls/proto/v1/django_pb2.pyi @@ -4,7 +4,7 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union +from typing import ClassVar as _ClassVar, Optional as _Optional DESCRIPTOR: _descriptor.FileDescriptor @@ -13,13 +13,3 @@ class Project(_message.Message): VERSION_FIELD_NUMBER: _ClassVar[int] version: str def __init__(self, version: _Optional[str] = ...) -> None: ... - -class GetProjectInfoRequest(_message.Message): - __slots__ = () - def __init__(self) -> None: ... - -class GetProjectInfoResponse(_message.Message): - __slots__ = ("project",) - PROJECT_FIELD_NUMBER: _ClassVar[int] - project: Project - def __init__(self, project: _Optional[_Union[Project, _Mapping]] = ...) -> None: ... diff --git a/python/djls/proto/v1/messages_pb2.py b/python/djls/proto/v1/messages_pb2.py index 749f509..428d13d 100644 --- a/python/djls/proto/v1/messages_pb2.py +++ b/python/djls/proto/v1/messages_pb2.py @@ -26,24 +26,22 @@ _runtime_version.ValidateProtobufRuntimeVersion( _sym_db = _symbol_database.Default() -from . import check_pb2 as v1_dot_check__pb2 -from . import django_pb2 as v1_dot_django__pb2 -from . import python_pb2 as v1_dot_python__pb2 +from . import commands_pb2 as v1_dot_commands__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11v1/messages.proto\x12\x10\x64jls.v1.messages\x1a\x0ev1/check.proto\x1a\x0fv1/django.proto\x1a\x0fv1/python.proto\"\xae\x02\n\x07Request\x12\x35\n\rcheck__health\x18\x01 \x01(\x0b\x32\x1c.djls.v1.check.HealthRequestH\x00\x12J\n\x18\x63heck__geodjango_prereqs\x18\x02 \x01(\x0b\x32&.djls.v1.check.GeoDjangoPrereqsRequestH\x00\x12I\n\x17python__get_environment\x18\xe8\x07 \x01(\x0b\x32%.djls.v1.python.GetEnvironmentRequestH\x00\x12J\n\x18\x64jango__get_project_info\x18\xd0\x0f \x01(\x0b\x32%.djls.v1.django.GetProjectInfoRequestH\x00\x42\t\n\x07\x63ommand\"\xdd\x02\n\x08Response\x12\x36\n\rcheck__health\x18\x01 \x01(\x0b\x32\x1d.djls.v1.check.HealthResponseH\x00\x12K\n\x18\x63heck__geodjango_prereqs\x18\x02 \x01(\x0b\x32\'.djls.v1.check.GeoDjangoPrereqsResponseH\x00\x12J\n\x17python__get_environment\x18\xe8\x07 \x01(\x0b\x32&.djls.v1.python.GetEnvironmentResponseH\x00\x12K\n\x18\x64jango__get_project_info\x18\xd0\x0f \x01(\x0b\x32&.djls.v1.django.GetProjectInfoResponseH\x00\x12)\n\x05\x65rror\x18\xa8\x46 \x01(\x0b\x32\x17.djls.v1.messages.ErrorH\x00\x42\x08\n\x06result\"\xa5\x01\n\x05\x45rror\x12*\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1c.djls.v1.messages.Error.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x11\n\ttraceback\x18\x03 \x01(\t\"L\n\x04\x43ode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x13\n\x0fINVALID_REQUEST\x10\x01\x12\x10\n\x0cPYTHON_ERROR\x10\x02\x12\x10\n\x0c\x44JANGO_ERROR\x10\x03\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11v1/messages.proto\x12\x10\x64jls.v1.messages\x1a\x11v1/commands.proto\"\xd2\x02\n\x07Request\x12>\n\rcheck__health\x18\x01 \x01(\x0b\x32%.djls.v1.commands.Check.HealthRequestH\x00\x12S\n\x18\x63heck__geodjango_prereqs\x18\x02 \x01(\x0b\x32/.djls.v1.commands.Check.GeoDjangoPrereqsRequestH\x00\x12R\n\x17python__get_environment\x18\xe8\x07 \x01(\x0b\x32..djls.v1.commands.Python.GetEnvironmentRequestH\x00\x12S\n\x18\x64jango__get_project_info\x18\xd0\x0f \x01(\x0b\x32..djls.v1.commands.Django.GetProjectInfoRequestH\x00\x42\t\n\x07\x63ommand\"\x81\x03\n\x08Response\x12?\n\rcheck__health\x18\x01 \x01(\x0b\x32&.djls.v1.commands.Check.HealthResponseH\x00\x12T\n\x18\x63heck__geodjango_prereqs\x18\x02 \x01(\x0b\x32\x30.djls.v1.commands.Check.GeoDjangoPrereqsResponseH\x00\x12S\n\x17python__get_environment\x18\xe8\x07 \x01(\x0b\x32/.djls.v1.commands.Python.GetEnvironmentResponseH\x00\x12T\n\x18\x64jango__get_project_info\x18\xd0\x0f \x01(\x0b\x32/.djls.v1.commands.Django.GetProjectInfoResponseH\x00\x12)\n\x05\x65rror\x18\xa8\x46 \x01(\x0b\x32\x17.djls.v1.messages.ErrorH\x00\x42\x08\n\x06result\"\xa5\x01\n\x05\x45rror\x12*\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1c.djls.v1.messages.Error.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x11\n\ttraceback\x18\x03 \x01(\t\"L\n\x04\x43ode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x13\n\x0fINVALID_REQUEST\x10\x01\x12\x10\n\x0cPYTHON_ERROR\x10\x02\x12\x10\n\x0c\x44JANGO_ERROR\x10\x03\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'v1.messages_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: DESCRIPTOR._loaded_options = None - _globals['_REQUEST']._serialized_start=90 - _globals['_REQUEST']._serialized_end=392 - _globals['_RESPONSE']._serialized_start=395 - _globals['_RESPONSE']._serialized_end=744 - _globals['_ERROR']._serialized_start=747 - _globals['_ERROR']._serialized_end=912 - _globals['_ERROR_CODE']._serialized_start=836 - _globals['_ERROR_CODE']._serialized_end=912 + _globals['_REQUEST']._serialized_start=59 + _globals['_REQUEST']._serialized_end=397 + _globals['_RESPONSE']._serialized_start=400 + _globals['_RESPONSE']._serialized_end=785 + _globals['_ERROR']._serialized_start=788 + _globals['_ERROR']._serialized_end=953 + _globals['_ERROR_CODE']._serialized_start=877 + _globals['_ERROR_CODE']._serialized_end=953 # @@protoc_insertion_point(module_scope) diff --git a/python/djls/proto/v1/messages_pb2.pyi b/python/djls/proto/v1/messages_pb2.pyi index 2da4b26..46311a7 100644 --- a/python/djls/proto/v1/messages_pb2.pyi +++ b/python/djls/proto/v1/messages_pb2.pyi @@ -2,9 +2,7 @@ # Any changes made to this file will be overwritten when the protobuf files are regenerated. # Source: v1/messages.proto -from . import check_pb2 as _check_pb2 -from . import django_pb2 as _django_pb2 -from . import python_pb2 as _python_pb2 +from . import commands_pb2 as _commands_pb2 from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message @@ -18,11 +16,11 @@ class Request(_message.Message): CHECK__GEODJANGO_PREREQS_FIELD_NUMBER: _ClassVar[int] PYTHON__GET_ENVIRONMENT_FIELD_NUMBER: _ClassVar[int] DJANGO__GET_PROJECT_INFO_FIELD_NUMBER: _ClassVar[int] - check__health: _check_pb2.HealthRequest - check__geodjango_prereqs: _check_pb2.GeoDjangoPrereqsRequest - python__get_environment: _python_pb2.GetEnvironmentRequest - django__get_project_info: _django_pb2.GetProjectInfoRequest - def __init__(self, check__health: _Optional[_Union[_check_pb2.HealthRequest, _Mapping]] = ..., check__geodjango_prereqs: _Optional[_Union[_check_pb2.GeoDjangoPrereqsRequest, _Mapping]] = ..., python__get_environment: _Optional[_Union[_python_pb2.GetEnvironmentRequest, _Mapping]] = ..., django__get_project_info: _Optional[_Union[_django_pb2.GetProjectInfoRequest, _Mapping]] = ...) -> None: ... + check__health: _commands_pb2.Check.HealthRequest + check__geodjango_prereqs: _commands_pb2.Check.GeoDjangoPrereqsRequest + python__get_environment: _commands_pb2.Python.GetEnvironmentRequest + django__get_project_info: _commands_pb2.Django.GetProjectInfoRequest + def __init__(self, check__health: _Optional[_Union[_commands_pb2.Check.HealthRequest, _Mapping]] = ..., check__geodjango_prereqs: _Optional[_Union[_commands_pb2.Check.GeoDjangoPrereqsRequest, _Mapping]] = ..., python__get_environment: _Optional[_Union[_commands_pb2.Python.GetEnvironmentRequest, _Mapping]] = ..., django__get_project_info: _Optional[_Union[_commands_pb2.Django.GetProjectInfoRequest, _Mapping]] = ...) -> None: ... class Response(_message.Message): __slots__ = ("check__health", "check__geodjango_prereqs", "python__get_environment", "django__get_project_info", "error") @@ -31,12 +29,12 @@ class Response(_message.Message): PYTHON__GET_ENVIRONMENT_FIELD_NUMBER: _ClassVar[int] DJANGO__GET_PROJECT_INFO_FIELD_NUMBER: _ClassVar[int] ERROR_FIELD_NUMBER: _ClassVar[int] - check__health: _check_pb2.HealthResponse - check__geodjango_prereqs: _check_pb2.GeoDjangoPrereqsResponse - python__get_environment: _python_pb2.GetEnvironmentResponse - django__get_project_info: _django_pb2.GetProjectInfoResponse + check__health: _commands_pb2.Check.HealthResponse + check__geodjango_prereqs: _commands_pb2.Check.GeoDjangoPrereqsResponse + python__get_environment: _commands_pb2.Python.GetEnvironmentResponse + django__get_project_info: _commands_pb2.Django.GetProjectInfoResponse error: Error - def __init__(self, check__health: _Optional[_Union[_check_pb2.HealthResponse, _Mapping]] = ..., check__geodjango_prereqs: _Optional[_Union[_check_pb2.GeoDjangoPrereqsResponse, _Mapping]] = ..., python__get_environment: _Optional[_Union[_python_pb2.GetEnvironmentResponse, _Mapping]] = ..., django__get_project_info: _Optional[_Union[_django_pb2.GetProjectInfoResponse, _Mapping]] = ..., error: _Optional[_Union[Error, _Mapping]] = ...) -> None: ... + def __init__(self, check__health: _Optional[_Union[_commands_pb2.Check.HealthResponse, _Mapping]] = ..., check__geodjango_prereqs: _Optional[_Union[_commands_pb2.Check.GeoDjangoPrereqsResponse, _Mapping]] = ..., python__get_environment: _Optional[_Union[_commands_pb2.Python.GetEnvironmentResponse, _Mapping]] = ..., django__get_project_info: _Optional[_Union[_commands_pb2.Django.GetProjectInfoResponse, _Mapping]] = ..., error: _Optional[_Union[Error, _Mapping]] = ...) -> None: ... class Error(_message.Message): __slots__ = ("code", "message", "traceback") diff --git a/python/djls/proto/v1/python_pb2.py b/python/djls/proto/v1/python_pb2.py index 6732944..a01398c 100644 --- a/python/djls/proto/v1/python_pb2.py +++ b/python/djls/proto/v1/python_pb2.py @@ -28,7 +28,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fv1/python.proto\x12\x0e\x64jls.v1.python\"\x9c\x01\n\x06Python\x12\x1e\n\x02os\x18\x01 \x01(\x0b\x32\x12.djls.v1.python.Os\x12\"\n\x04site\x18\x02 \x01(\x0b\x32\x14.djls.v1.python.Site\x12 \n\x03sys\x18\x03 \x01(\x0b\x32\x13.djls.v1.python.Sys\x12,\n\tsysconfig\x18\x04 \x01(\x0b\x32\x19.djls.v1.python.Sysconfig\"f\n\x02Os\x12\x30\n\x07\x65nviron\x18\x01 \x03(\x0b\x32\x1f.djls.v1.python.Os.EnvironEntry\x1a.\n\x0c\x45nvironEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x86\x01\n\x04Site\x12\x34\n\x08packages\x18\x01 \x03(\x0b\x32\".djls.v1.python.Site.PackagesEntry\x1aH\n\rPackagesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.djls.v1.python.Package:\x02\x38\x01\"\xe0\x02\n\x03Sys\x12\x13\n\x0b\x64\x65\x62ug_build\x18\x01 \x01(\x08\x12\x10\n\x08\x64\x65v_mode\x18\x02 \x01(\x08\x12\x0f\n\x07is_venv\x18\x03 \x01(\x08\x12\x10\n\x08\x61\x62iflags\x18\x04 \x01(\t\x12\x13\n\x0b\x62\x61se_prefix\x18\x05 \x01(\t\x12\x18\n\x10\x64\x65\x66\x61ult_encoding\x18\x06 \x01(\t\x12\x12\n\nexecutable\x18\x07 \x01(\t\x12\x1b\n\x13\x66ilesystem_encoding\x18\x08 \x01(\t\x12\x1b\n\x13implementation_name\x18\t \x01(\t\x12\x10\n\x08platform\x18\n \x01(\t\x12\x0e\n\x06prefix\x18\x0b \x01(\t\x12\x1c\n\x14\x62uiltin_module_names\x18\x0c \x03(\t\x12\x11\n\tdll_paths\x18\r \x03(\t\x12\x0c\n\x04path\x18\x0e \x03(\t\x12\x31\n\x0cversion_info\x18\x0f \x01(\x0b\x32\x1b.djls.v1.python.VersionInfo\"~\n\x0bVersionInfo\x12\r\n\x05major\x18\x01 \x01(\r\x12\r\n\x05minor\x18\x02 \x01(\r\x12\r\n\x05micro\x18\x03 \x01(\r\x12\x32\n\x0creleaselevel\x18\x04 \x01(\x0e\x32\x1c.djls.v1.python.ReleaseLevel\x12\x0e\n\x06serial\x18\x05 \x01(\r\"\x96\x01\n\tSysconfig\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x12\x0f\n\x07include\x18\x02 \x01(\t\x12\x13\n\x0bplatinclude\x18\x03 \x01(\t\x12\x0f\n\x07platlib\x18\x04 \x01(\t\x12\x12\n\nplatstdlib\x18\x05 \x01(\t\x12\x0f\n\x07purelib\x18\x06 \x01(\t\x12\x0f\n\x07scripts\x18\x07 \x01(\t\x12\x0e\n\x06stdlib\x18\x08 \x01(\t\"\x97\x02\n\x07Package\x12\x11\n\tdist_name\x18\x01 \x01(\t\x12\x14\n\x0c\x64ist_version\x18\x02 \x01(\t\x12\x1a\n\rdist_editable\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1e\n\x11\x64ist_entry_points\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x1a\n\rdist_location\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x15\n\rdist_requires\x18\x06 \x03(\t\x12!\n\x14\x64ist_requires_python\x18\x07 \x01(\tH\x03\x88\x01\x01\x42\x10\n\x0e_dist_editableB\x14\n\x12_dist_entry_pointsB\x10\n\x0e_dist_locationB\x17\n\x15_dist_requires_python\"\x17\n\x15GetEnvironmentRequest\"@\n\x16GetEnvironmentResponse\x12&\n\x06python\x18\x01 \x01(\x0b\x32\x16.djls.v1.python.Python*=\n\x0cReleaseLevel\x12\t\n\x05\x41LPHA\x10\x00\x12\x08\n\x04\x42\x45TA\x10\x01\x12\r\n\tCANDIDATE\x10\x02\x12\t\n\x05\x46INAL\x10\x03\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fv1/python.proto\x12\x0e\x64jls.v1.python\"\x9c\x01\n\x06Python\x12\x1e\n\x02os\x18\x01 \x01(\x0b\x32\x12.djls.v1.python.Os\x12\"\n\x04site\x18\x02 \x01(\x0b\x32\x14.djls.v1.python.Site\x12 \n\x03sys\x18\x03 \x01(\x0b\x32\x13.djls.v1.python.Sys\x12,\n\tsysconfig\x18\x04 \x01(\x0b\x32\x19.djls.v1.python.Sysconfig\"f\n\x02Os\x12\x30\n\x07\x65nviron\x18\x01 \x03(\x0b\x32\x1f.djls.v1.python.Os.EnvironEntry\x1a.\n\x0c\x45nvironEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x86\x01\n\x04Site\x12\x34\n\x08packages\x18\x01 \x03(\x0b\x32\".djls.v1.python.Site.PackagesEntry\x1aH\n\rPackagesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.djls.v1.python.Package:\x02\x38\x01\"\xe0\x02\n\x03Sys\x12\x13\n\x0b\x64\x65\x62ug_build\x18\x01 \x01(\x08\x12\x10\n\x08\x64\x65v_mode\x18\x02 \x01(\x08\x12\x0f\n\x07is_venv\x18\x03 \x01(\x08\x12\x10\n\x08\x61\x62iflags\x18\x04 \x01(\t\x12\x13\n\x0b\x62\x61se_prefix\x18\x05 \x01(\t\x12\x18\n\x10\x64\x65\x66\x61ult_encoding\x18\x06 \x01(\t\x12\x12\n\nexecutable\x18\x07 \x01(\t\x12\x1b\n\x13\x66ilesystem_encoding\x18\x08 \x01(\t\x12\x1b\n\x13implementation_name\x18\t \x01(\t\x12\x10\n\x08platform\x18\n \x01(\t\x12\x0e\n\x06prefix\x18\x0b \x01(\t\x12\x1c\n\x14\x62uiltin_module_names\x18\x0c \x03(\t\x12\x11\n\tdll_paths\x18\r \x03(\t\x12\x0c\n\x04path\x18\x0e \x03(\t\x12\x31\n\x0cversion_info\x18\x0f \x01(\x0b\x32\x1b.djls.v1.python.VersionInfo\"~\n\x0bVersionInfo\x12\r\n\x05major\x18\x01 \x01(\r\x12\r\n\x05minor\x18\x02 \x01(\r\x12\r\n\x05micro\x18\x03 \x01(\r\x12\x32\n\x0creleaselevel\x18\x04 \x01(\x0e\x32\x1c.djls.v1.python.ReleaseLevel\x12\x0e\n\x06serial\x18\x05 \x01(\r\"\x96\x01\n\tSysconfig\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x12\x0f\n\x07include\x18\x02 \x01(\t\x12\x13\n\x0bplatinclude\x18\x03 \x01(\t\x12\x0f\n\x07platlib\x18\x04 \x01(\t\x12\x12\n\nplatstdlib\x18\x05 \x01(\t\x12\x0f\n\x07purelib\x18\x06 \x01(\t\x12\x0f\n\x07scripts\x18\x07 \x01(\t\x12\x0e\n\x06stdlib\x18\x08 \x01(\t\"\x97\x02\n\x07Package\x12\x11\n\tdist_name\x18\x01 \x01(\t\x12\x14\n\x0c\x64ist_version\x18\x02 \x01(\t\x12\x1a\n\rdist_editable\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1e\n\x11\x64ist_entry_points\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x1a\n\rdist_location\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x15\n\rdist_requires\x18\x06 \x03(\t\x12!\n\x14\x64ist_requires_python\x18\x07 \x01(\tH\x03\x88\x01\x01\x42\x10\n\x0e_dist_editableB\x14\n\x12_dist_entry_pointsB\x10\n\x0e_dist_locationB\x17\n\x15_dist_requires_python*=\n\x0cReleaseLevel\x12\t\n\x05\x41LPHA\x10\x00\x12\x08\n\x04\x42\x45TA\x10\x01\x12\r\n\tCANDIDATE\x10\x02\x12\t\n\x05\x46INAL\x10\x03\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -39,8 +39,8 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_OS_ENVIRONENTRY']._serialized_options = b'8\001' _globals['_SITE_PACKAGESENTRY']._loaded_options = None _globals['_SITE_PACKAGESENTRY']._serialized_options = b'8\001' - _globals['_RELEASELEVEL']._serialized_start=1444 - _globals['_RELEASELEVEL']._serialized_end=1505 + _globals['_RELEASELEVEL']._serialized_start=1353 + _globals['_RELEASELEVEL']._serialized_end=1414 _globals['_PYTHON']._serialized_start=36 _globals['_PYTHON']._serialized_end=192 _globals['_OS']._serialized_start=194 @@ -59,8 +59,4 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_SYSCONFIG']._serialized_end=1069 _globals['_PACKAGE']._serialized_start=1072 _globals['_PACKAGE']._serialized_end=1351 - _globals['_GETENVIRONMENTREQUEST']._serialized_start=1353 - _globals['_GETENVIRONMENTREQUEST']._serialized_end=1376 - _globals['_GETENVIRONMENTRESPONSE']._serialized_start=1378 - _globals['_GETENVIRONMENTRESPONSE']._serialized_end=1442 # @@protoc_insertion_point(module_scope) diff --git a/python/djls/proto/v1/python_pb2.pyi b/python/djls/proto/v1/python_pb2.pyi index a5633cc..d321a0d 100644 --- a/python/djls/proto/v1/python_pb2.pyi +++ b/python/djls/proto/v1/python_pb2.pyi @@ -144,13 +144,3 @@ class Package(_message.Message): dist_requires: _containers.RepeatedScalarFieldContainer[str] dist_requires_python: str def __init__(self, dist_name: _Optional[str] = ..., dist_version: _Optional[str] = ..., dist_editable: bool = ..., dist_entry_points: _Optional[str] = ..., dist_location: _Optional[str] = ..., dist_requires: _Optional[_Iterable[str]] = ..., dist_requires_python: _Optional[str] = ...) -> None: ... - -class GetEnvironmentRequest(_message.Message): - __slots__ = () - def __init__(self) -> None: ... - -class GetEnvironmentResponse(_message.Message): - __slots__ = ("python",) - PYTHON_FIELD_NUMBER: _ClassVar[int] - python: Python - def __init__(self, python: _Optional[_Union[Python, _Mapping]] = ...) -> None: ...