PyAres 0.2.2__tar.gz → 0.3.1__tar.gz

{pyares-0.2.2 → pyares-0.3.1}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: PyAres
-Version: 0.2.2
+Version: 0.3.1
 Summary: The official Python library for ARES.
-Project-URL: Homepage, https://github.com/AFRL-ARES
+Project-URL: Homepage, https://github.com/AFRL-ARES/PyAres
 Author-email: AFRL <AFRL.RX.AREScontact@us.af.mil>
 License: MIT
 License-File: LICENSE
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: ares-datamodel>=0.15.1b1
+Requires-Dist: ares-datamodel>=0.16.0
 Requires-Dist: grpcio-tools>=1.75.1
 Requires-Dist: grpcio<2.0.0,>=1.71.0
 Description-Content-Type: text/markdown

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Analyzing/analysis_service.py

@@ -1,7 +1,7 @@
 # Standard Imports
 import grpc
 from concurrent import futures
-from typing import Callable, Awaitable, Union, Mapping, Dict
+from typing import Callable, Awaitable, Union, Mapping, Dict, Optional
 
 # Import generated protobuf and gRPC stubs
 from ares_datamodel.analyzing.remote import ares_remote_analyzer_service_pb2 as analyzer_service
@@ -22,6 +22,7 @@ from ..Utils import ares_outcome_utils
 
 # Import python models
 from ..Models import ares_data_models, RequestMetadata
+from ..Models import AresSchemaEntry
 from .analyzer_models import AnalysisRequest, Analysis, InfoResponse
 
 # Type hints for the user's custom logic
@@ -120,14 +121,7 @@ class AresAnalyzerServiceWrapper(analyzer_service_grpc.AresRemoteAnalyzerService
         try:
             for(key, value) in self._settings.items():
                 settings_entry = capabilities.settings_schema.fields[key]
-                settings_entry.type = value.type
-                settings_entry.optional = value.optional
-
-                if len(value.string_choices.strings) != 0:
-                    settings_entry.string_choices.strings.extend(value.string_choices.strings)
-
-                elif len(value.number_choices.numbers) != 0:
-                    settings_entry.number_choices.numbers.extend(value.number_choices.numbers)
+                settings_entry.CopyFrom(value)
             
             return capabilities
 
@@ -143,24 +137,19 @@ class AresAnalyzerServiceWrapper(analyzer_service_grpc.AresRemoteAnalyzerService
             print(f"Exception while trying to respond to ARES with connection status! {e}")
 
     def ValidateInputs(self, request: analyzer_service.ParameterValidationRequest, context): 
-        print("Validating Inputs")
         response = analyzer_service.ParameterValidationResult(success=True)
         provided_params: Mapping[str, ares_data_schema_pb2.SchemaEntry] = request.input_schema.fields
 
         for stored_key, stored_schema in self._analysis_parameters.items():
-            print(f"LOOKING AT {stored_key}")
             if stored_key in provided_params:
                 matching_schema = provided_params[stored_key]
                 if stored_schema.type != matching_schema.type:
-                    print(f" THIS IS THE TYPE RIGHT HERE LOOK AT IT: {type(matching_schema)}")
                     message = f"Schema Mismatch! {stored_key} was provided with the value type {stored_schema.type}, but the value type {matching_schema} was expected!"
                     response.messages.append(message)
-                    print(message)
             else:
                 if not stored_schema.optional:
                     message = f"Schema Missing! {stored_key} is marked as a required piece of data for analysis, but no assignment was found in the provided schema!"
                     response.messages.append(message)
-                    print(message)
 
         if len(response.messages) != 0:
             response.success = False
@@ -211,7 +200,7 @@ class AresAnalyzerService:
         else:
             self._server.add_insecure_port(f'[::]:{self._port}')
 
-    def add_setting(self, setting_name: str, setting_type: ares_data_models.AresDataType, optional: bool = True, constraints: Union[list[int], list[str], list[float]] = []):
+    def add_setting(self, setting_name: str, setting_type: ares_data_models.AresDataType, optional: bool = True, constraints: Union[list[int], list[str], list[float]] = [], struct_schema: Optional[Dict[str, AresSchemaEntry]] = None):
         """
         Adds an analyzer setting to be reported to ARES when capabilities are requested.
         While most `PyAres.Models.AresDataType` options are supported, bool arrays and byte arrays
@@ -222,10 +211,11 @@ class AresAnalyzerService:
             setting_type (AresDataType): The type of this settings value.
             optional (bool): Whether the setting is optional.
             constraints: An optional list of values to constrain the available setting choices. Can be integers, strings, or floats.
+            struct_schema: An optional dictionary defining the fields of a STRUCT type setting, using AresSchemaEntry objects.
         """
-        self._service_wrapper._settings[setting_name] = ares_data_schema_utils.create_settings_schema_entry(setting_type, optional, constraints)
+        self._service_wrapper._settings[setting_name] = ares_data_schema_utils.create_settings_schema_entry(setting_type, optional, constraints, struct_schema)
 
-    def add_analysis_parameter(self, parameter_name: str, parameter_type: ares_data_models.AresDataType, optional: bool = False):
+    def add_analysis_parameter(self, parameter_name: str, parameter_type: ares_data_models.AresDataType, optional: bool = False, struct_schema: Optional[Dict[str, AresSchemaEntry]] = None):
         """
         Adds an analysis parameter that will be reported to ARES. Analysis parameters are inputs your analyzer accepts from ARES, and will be mapped to command outputs
         in experiment scripts.
@@ -234,8 +224,9 @@ class AresAnalyzerService:
             parameter_name (str): The name of the parameter being created.
             parameter_type (AresDataType): The type associated with the new parameter.
             optional (bool): Defaults to false. Determines whether your analyzer requires this information.
+            struct_schema: An optional dictionary defining the fields of a STRUCT type parameter, using AresSchemaEntry objects.
         """
-        self._service_wrapper._analysis_parameters[parameter_name] = ares_data_schema_utils.create_settings_schema_entry(parameter_type, optional, [])
+        self._service_wrapper._analysis_parameters[parameter_name] = ares_data_schema_utils.create_settings_schema_entry(parameter_type, optional, [], struct_schema)
 
     def set_timeout(self, new_timeout: int):
         """
@@ -268,12 +259,3 @@ class AresAnalyzerService:
         """
         print("Stopping Ares Analyzer Service...")
         self._server.stop(0).wait()
-
-
-
-
-
-
-
-
-

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Models/__init__.py

@@ -1,7 +1,8 @@
-from .ares_data_models import AresDataType, Outcome, RequestMetadata
+from .ares_data_models import AresDataType, Outcome, RequestMetadata, AresSchemaEntry
 
 __all__ = [
     "AresDataType",
     "Outcome",
-    "RequestMetadata"
+    "RequestMetadata",
+    "AresSchemaEntry"
 ]

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Models/ares_data_models.py

@@ -1,5 +1,7 @@
 from ares_datamodel import request_metadata_pb2
 from enum import Enum
+from dataclasses import dataclass, field
+from typing import Union, List, Optional, Dict
 
 class AresDataType(Enum):
     UNKNOWN = 0
@@ -9,8 +11,9 @@ class AresDataType(Enum):
     NUMBER = 4
     STRING_ARRAY = 5
     NUMBER_ARRAY = 6
-    BYTE_ARRAY = 7
-    BOOL_ARRAY = 8
+    LIST = 7
+    STRUCT = 8
+    BYTE_ARRAY = 9
 
 class Outcome(Enum):
     UNSPECIFIED_OUTCOME = 0
@@ -30,4 +33,13 @@ class RequestMetadata():
     def from_default_values(cls):
         """ Alternative constructor for creating fake metadata """
         default = request_metadata_pb2.RequestMetadata(system_name="TEST SYSTEM", campaign_name="TEST CAMPAIGN", campaign_id="TEST ID", experiment_id="TEST EXPERIMENT ID")
-        return cls(default)
+        return cls(default)
+
+@dataclass
+class AresSchemaEntry:
+    type: AresDataType
+    optional: bool = False
+    description: str = ""
+    unit: str = ""
+    choices: Union[List[str], List[int], List[float]] = field(default_factory=list)
+    struct_schema: Optional[Dict[str, 'AresSchemaEntry']] = None

pyares-0.3.1/PyAres/Utils/ares_data_schema_utils.py

@@ -0,0 +1,49 @@
+from typing import Union, Dict, Optional, List
+from ares_datamodel import ares_data_schema_pb2
+from ..Models import ares_data_models
+from ..Models.ares_data_models import AresSchemaEntry
+
+def convert_ares_schema_entry_to_proto(entry: AresSchemaEntry) -> ares_data_schema_pb2.SchemaEntry:
+    proto_entry = create_settings_schema_entry(entry.type, entry.optional, entry.choices, entry.struct_schema)
+    proto_entry.description = entry.description
+    proto_entry.unit = entry.unit
+    return proto_entry
+
+def create_settings_schema_entry(
+    setting_type: ares_data_models.AresDataType, 
+    optional: bool, 
+    choices: Union[list[str], list[int], list[float]],
+    struct_schema: Optional[Dict[str, AresSchemaEntry]] = None) -> ares_data_schema_pb2.SchemaEntry:
+    """
+    Creates a protobuf SchemaEntry message from the provided setting details.
+
+    Args:
+        setting_type (AresDataType): The data type of the setting.
+        optional (bool): Whether the setting is optional.
+        choices (Union[list[str], list[int], list[float]]): A list of valid choices for the setting.
+        struct_schema (Optional[Dict[str, AresSchemaEntry]]): Nested schema definition for STRUCT types.
+
+    Returns:
+        (SchemaEntry): A new SchemaEntry message.
+    """
+
+    if(isinstance(choices, list)):
+        if(len(choices) == 0):
+            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
+
+        elif(all(isinstance(item, str) for item in choices)):
+            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
+            schema_entry.string_choices.strings.extend(choices)
+    
+        elif(all(isinstance(item, (int, float)) for item in choices)):
+            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
+            schema_entry.number_choices.numbers.extend(choices)
+
+        else:
+            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
+            
+    if struct_schema is not None:
+        for key, value in struct_schema.items():
+            schema_entry.struct_schema.fields[key].CopyFrom(convert_ares_schema_entry_to_proto(value))
+
+    return schema_entry

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Utils/ares_data_type_utils.py

@@ -17,21 +17,19 @@ def determine_python_ares_data_type(value: Union[int, float, str, bool, list]):
     case str():
       return AresDataType.STRING
     case bool():
-      # Boolean is a subtype of int, meaning we have to check if it's a bool
-      # before we check if it's an int, otherwise every bool would return an int instead.
       return AresDataType.BOOLEAN
     case int():
       return AresDataType.NUMBER
     case float():
       return AresDataType.NUMBER
     case list():
-      if(all(isinstance(x, str) for x in value)):
+      if(all(isinstance(x, bool) for x in value)):
+        return AresDataType.LIST
+      elif(all(isinstance(x, str) for x in value)):
         return AresDataType.STRING_ARRAY
       elif(all(isinstance(x, (int, float)) for x in value)):
         return AresDataType.NUMBER_ARRAY
-      elif(all(isinstance(x, bool) for x in value)):
-        return AresDataType.BOOL_ARRAY
       else:
-        return AresDataType.UNKNOWN
+        return AresDataType.LIST
     case _:
       return AresDataType.UNKNOWN

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Utils/ares_struct_utils.py

@@ -33,7 +33,8 @@ def create_string_struct(key: str, value: str) -> ares_struct_pb2.AresStruct:
         (AresStruct): A new AresStruct containing the provided key and value.
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_string(value)
+    new_entry = new_struct.fields[key] 
+    new_entry.CopyFrom(ares_value_utils.create_string(value))
     return new_struct
 
 def create_number_struct(key: str, value: Union[int, float]) -> ares_struct_pb2.AresStruct:
@@ -48,7 +49,8 @@ def create_number_struct(key: str, value: Union[int, float]) -> ares_struct_pb2.
         (AresStruct): A new AresStruct containing the provided key and value.
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_number(value)
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_number(value))
     return new_struct
 
 def create_bool_struct(key: str, value: bool) -> ares_struct_pb2.AresStruct:
@@ -63,7 +65,8 @@ def create_bool_struct(key: str, value: bool) -> ares_struct_pb2.AresStruct:
         (AresStruct): A new AresStruct containing the provided key and value.
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_bool(value)
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_bool(value)) 
     return new_struct
 
 def create_null_struct(key: str) -> ares_struct_pb2.AresStruct:
@@ -77,7 +80,8 @@ def create_null_struct(key: str) -> ares_struct_pb2.AresStruct:
         (AresStruct): A new AresStruct containing the provided key and a null value.
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_null()
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_null())
     return new_struct
 
 def create_string_array_struct(key: str, value: list[str]) -> ares_struct_pb2.AresStruct:
@@ -92,7 +96,8 @@ def create_string_array_struct(key: str, value: list[str]) -> ares_struct_pb2.Ar
         (AresStruct): A new AresStruct containing the provided key and value
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_string_array(value)
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_string_array(value))
     return new_struct
 
 def create_number_array_struct(key: str, value: list[Union[int, float]]) -> ares_struct_pb2.AresStruct:
@@ -107,22 +112,8 @@ def create_number_array_struct(key: str, value: list[Union[int, float]]) -> ares
         (AresStruct): A new AresStruct containing the provided key and value
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_number_array(value)
-    return new_struct
-
-def create_bool_array_struct(key: str, value: list[bool]) -> ares_struct_pb2.AresStruct:
-    """
-    Creates a new AresStruct with a bool array initialized using the provided key and value.
-
-    Args:
-        key (str): The associated key to be used when storing the given value.
-        value (list[bool]): The list of bools to be stored in the new AresStruct.
-
-    Returns:
-        (AresStruct): A new AresStruct containing the provided key and value
-    """
-    new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_bool_array(value)
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_number_array(value))
     return new_struct
 
 def create_bytes_array_struct(key: str, value: bytes) -> ares_struct_pb2.AresStruct:
@@ -137,7 +128,8 @@ def create_bytes_array_struct(key: str, value: bytes) -> ares_struct_pb2.AresStr
         (AresStruct): A new AresStruct containing the provided key and value
     """
     new_struct = ares_struct_pb2.AresStruct()
-    new_struct.fields[key] = ares_value_utils.create_bytes(value)
+    new_entry = new_struct.fields[key]
+    new_entry.CopyFrom(ares_value_utils.create_bytes(value))
     return new_struct
 
 def add_value_to_struct(existing_struct: ares_struct_pb2.AresStruct, key: str, new_value: ares_struct_pb2.AresValue, replace: bool = True) -> ares_struct_pb2.AresStruct:
@@ -180,7 +172,7 @@ def create_empty_struct() -> ares_struct_pb2.AresStruct:
     """
     return ares_struct_pb2.AresStruct()
 
-def create_ares_struct(key: str, value: Any):
+def create_ares_struct(key: str, value: Any) -> ares_struct_pb2.AresStruct:
     """
     Creates a new AresStruct using the provided key and value.
 
@@ -208,17 +200,24 @@ def create_ares_struct(key: str, value: Any):
         if(len(value) == 0):
             return create_null_struct(key)
 
+        #Specifically placed here to catch bools before ints, as otherwise python with treat them as ints instead
+        elif(all(isinstance(item, bool) for item in value)):
+            new_struct = ares_struct_pb2.AresStruct()
+            new_struct.fields[key].CopyFrom(ares_value_utils.create_array(value))
+            return new_struct
+        
         elif(all(isinstance(item, str) for item in value)):
             return create_string_array_struct(key, value)
         
         elif(all(isinstance(item, (float, int)) for item in value)):
             return create_number_array_struct(key, value)
         
-        elif(all(isinstance(item, bool) for item in value)):
-            return create_bool_array_struct(key, value)
+        else:
+            new_struct = ares_struct_pb2.AresStruct()
+            new_struct.fields[key].CopyFrom(ares_value_utils.create_array(value))
+            return new_struct
     
-    else:
-        return create_null_struct(key)
-
     
+    return create_null_struct(key)
 
+    

{pyares-0.2.2 → pyares-0.3.1}/PyAres/Utils/ares_value_utils.py

@@ -1,6 +1,6 @@
 from ares_datamodel import ares_struct_pb2
 from ares_datamodel import ares_data_type_pb2
-from typing import Union, Any
+from typing import Union, Any, Dict
 
 from . import ares_data_type_utils
 from ..Models import AresDataType 
@@ -37,8 +37,13 @@ def py_to_ares_value(py_value, ares_value: ares_struct_pb2.AresValue):
             ares_value.string_array_value.strings.extend(py_value)
         elif(all(isinstance(x, (int, float)) for x in py_value)):
             ares_value.number_array_value.numbers.extend(py_value)
-        elif(all(isinstance(x, bool) for x in py_value)):
-            ares_value.bool_array_value.bools.extend(py_value)
+        else:
+            for item in py_value:
+                ares_value.list_value.values.append(create_ares_value(item))
+
+    elif py_value == None:
+        ares_value.null_value = ares_struct_pb2.NullValue.NULL_VALUE
+
     else:
         raise TypeError(f"Unsupported type for AresValue: {type(py_value)}")
 
@@ -125,18 +130,39 @@ def create_bytes(value: bytes) -> ares_struct_pb2.AresValue:
     """
     return ares_struct_pb2.AresValue(bytes_value=value)
 
-def create_bool_array(value: list[bool]) -> ares_struct_pb2.AresValue:
+def create_array(values: list[Any]) -> ares_struct_pb2.AresValue:
     """
-    Creates a new AresValue, initialized to the provided list of booleans.
+    Creates a new AresValue, initialized to the provided list of AresValues.
 
     Args:
-        value (list[bool]): The list of booleans to be stored in the new AresValue.
+        value (list[Any]): The list of values to be stored in the new AresValue.
 
     Returns:
-        (AresValue): A new AresValue containing the provided list of booleans.
+        (AresValue): A new AresValue containing the provided list of values.
     """
     ares_value = ares_struct_pb2.AresValue()
-    ares_value.bool_array_value.bools.extend(value)
+    for item in values:
+        ares_value.list_value.values.append(create_ares_value(item))
+
+    return ares_value
+
+def create_struct(values: Dict) -> ares_struct_pb2.AresValue:
+    """
+    Creates a new AresValue, initialized with an AresStruct.
+
+    Args:
+        value (Dict): The dictionary of values to be added to the AresStruct.
+
+    Returns:
+        (AresValue): A new AresValue containing the provided dictionaries values in an AresStruct.
+    """
+    ares_value = ares_struct_pb2.AresValue()
+    
+    for key, value in values.items():
+        new_entry = ares_value.struct_value.fields[key]
+        new_entry.CopyFrom(create_ares_value(value))
+ 
+
     return ares_value
 
 def create_default(python_datatype: AresDataType) -> ares_struct_pb2.AresValue:
@@ -169,11 +195,14 @@ def create_default(python_datatype: AresDataType) -> ares_struct_pb2.AresValue:
     elif(dataType == ares_data_type_pb2.AresDataType.NUMBER_ARRAY):
         return create_number_array([])
     
-    elif(dataType == ares_data_type_pb2.AresDataType.BOOL_ARRAY):
-        return create_bool_array([])
+    elif(dataType == ares_data_type_pb2.AresDataType.LIST):
+        return create_array([])
     
     elif(dataType == ares_data_type_pb2.AresDataType.BYTE_ARRAY):
         return create_bytes(bytes())
+    
+    elif(dataType == ares_data_type_pb2.AresDataType.STRUCT):
+        return create_struct({})
     else:
         return create_null()
     
@@ -191,27 +220,30 @@ def create_ares_value(value: Any) -> ares_struct_pb2.AresValue:
     if(isinstance(value, str)):
         return create_string(value)
     
-    elif(isinstance(value, (int, float))):
-        return create_number(value)
-    
     elif(isinstance(value, bool)):
         return create_bool(value)
+
+    elif(isinstance(value, (int, float))):
+        return create_number(value)
     
     elif(isinstance(value, bytes)):
         return create_bytes(value)
     
     elif(isinstance(value, list)):
-        if all(isinstance(x, (int, float)) for x in value):
+        if all(isinstance(x, bool) for x in value):
+            return create_array(value)
+        
+        elif all(isinstance(x, (int, float)) for x in value):
             return create_number_array(value)
         
         elif all(isinstance(x, str) for x in value):
             return create_string_array(value)
         
-        elif all(isinstance(x, bool) for x in value):
-            return create_bool_array(value)
-        
         else:
-            return create_null()
+            return create_array(value)
+        
+    elif(isinstance(value, Dict)):
+        return create_struct(value)
         
     else:
         return create_null()

{pyares-0.2.2 → pyares-0.3.1}/pyproject.toml

@@ -18,11 +18,11 @@ classifiers = [
 dependencies = [
     "grpcio-tools >= 1.75.1",
     "grpcio >= 1.71.0, < 2.0.0",
-    "ares-datamodel >= 0.15.1b1",
+    "ares-datamodel >= 0.16.0",
 ]
 
 [project.urls]
-Homepage = "https://github.com/AFRL-ARES"
+Homepage = "https://github.com/AFRL-ARES/PyAres"
 
 [tool.hatch.version]
 source = "env"

{pyares-0.2.2 → pyares-0.3.1}/tests/test_analyzer.py

@@ -71,15 +71,32 @@ class TestAresAnalyzerService(unittest.TestCase):
         # Add an Input Parameter (e.g., 'Image')
         self.service.add_analysis_parameter("InputImage", ares_data_models.AresDataType.STRING, optional=False)
 
+        # Add a Struct Setting
+        nested_schema = {
+            "SubField": ares_data_models.AresSchemaEntry(
+                type=ares_data_models.AresDataType.STRING,
+                description="A nested field"
+            )
+        }
+        self.service.add_setting("Complex Setting", ares_data_models.AresDataType.STRUCT, optional=True, struct_schema=nested_schema)
+
         # Verify internal storage
         self.assertIn("Threshold", self.service._service_wrapper._settings)
         self.assertIn("InputImage", self.service._service_wrapper._analysis_parameters)
+        self.assertIn("Complex Setting", self.service._service_wrapper._settings)
 
         # Verify capabilities response
         caps = self.service._service_wrapper.GetAnalyzerCapabilities(None, None)
         self.assertIn("Threshold", caps.settings_schema.fields)
         self.assertEqual(caps.settings_schema.fields["Threshold"].type, ares_data_type_pb2.AresDataType.NUMBER)
 
+        # Verify Struct in response
+        self.assertIn("Complex Setting", caps.settings_schema.fields)
+        complex_field = caps.settings_schema.fields["Complex Setting"]
+        self.assertEqual(complex_field.type, ares_data_type_pb2.AresDataType.STRUCT)
+        self.assertIn("SubField", complex_field.struct_schema.fields)
+        self.assertEqual(complex_field.struct_schema.fields["SubField"].type, ares_data_type_pb2.AresDataType.STRING)
+
     def test_validation_logic(self):
         """Test that the service correctly validates incoming input schemas."""
         self.service = AresAnalyzerService(self.analyze_func, self.analyzer_name, self.analyzer_version, port=0)

pyares-0.3.1/tests/test_ares_data_schema_utils.py

@@ -0,0 +1,77 @@
+import unittest
+from PyAres.Utils import ares_data_schema_utils
+from PyAres.Models import AresDataType, AresSchemaEntry
+from ares_datamodel import ares_data_type_pb2
+
+class TestAresDataSchemaUtils(unittest.TestCase):
+    def test_create_simple_entry(self):
+        entry = ares_data_schema_utils.create_settings_schema_entry(
+            AresDataType.STRING, 
+            optional=True, 
+            choices=[]
+        )
+        self.assertEqual(entry.type, ares_data_type_pb2.AresDataType.STRING)
+        self.assertTrue(entry.optional)
+
+    def test_create_entry_with_string_choices(self):
+        choices = ["A", "B"]
+        entry = ares_data_schema_utils.create_settings_schema_entry(
+            AresDataType.STRING,
+            optional=False,
+            choices=choices
+        )
+        self.assertEqual(entry.string_choices.strings, choices)
+
+    def test_create_entry_with_number_choices(self):
+        choices = [1, 2.0]
+        entry = ares_data_schema_utils.create_settings_schema_entry(
+            AresDataType.NUMBER,
+            optional=False,
+            choices=choices
+        )
+        self.assertEqual(entry.number_choices.numbers, choices)
+
+    def test_create_entry_with_mixed_choices(self):
+        # Should result in no choices being set if types are mixed
+        choices = ["A", 1]
+        entry = ares_data_schema_utils.create_settings_schema_entry(
+            AresDataType.STRING,
+            optional=False,
+            choices=choices
+        )
+
+        self.assertEqual(len(entry.string_choices.strings), 0)
+        self.assertEqual(len(entry.number_choices.numbers), 0)
+
+    def test_convert_ares_schema_entry_to_proto(self):
+        py_entry = AresSchemaEntry(
+            type=AresDataType.NUMBER,
+            optional=True,
+            description="Test Desc",
+            unit="m/s",
+            choices=[1.0, 2.0]
+        )
+        proto = ares_data_schema_utils.convert_ares_schema_entry_to_proto(py_entry)
+        self.assertEqual(proto.type, ares_data_type_pb2.AresDataType.NUMBER)
+        self.assertTrue(proto.optional)
+        self.assertEqual(proto.description, "Test Desc")
+        self.assertEqual(proto.unit, "m/s")
+        self.assertEqual(proto.number_choices.numbers, [1.0, 2.0])
+
+    def test_nested_struct_schema(self):
+        nested_field = AresSchemaEntry(type=AresDataType.STRING, description="Inner")
+        struct_entry = AresSchemaEntry(
+            type=AresDataType.STRUCT,
+            struct_schema={"inner_key": nested_field}
+        )
+        
+        proto = ares_data_schema_utils.convert_ares_schema_entry_to_proto(struct_entry)
+        self.assertEqual(proto.type, ares_data_type_pb2.AresDataType.STRUCT)
+        self.assertIn("inner_key", proto.struct_schema.fields)
+        
+        inner_proto = proto.struct_schema.fields["inner_key"]
+        self.assertEqual(inner_proto.type, ares_data_type_pb2.AresDataType.STRING)
+        self.assertEqual(inner_proto.description, "Inner")
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

pyares-0.3.1/tests/test_ares_data_type_utils.py

@@ -0,0 +1,18 @@
+import unittest
+from PyAres.Utils import ares_data_type_utils
+from PyAres.Models import AresDataType
+
+class TestAresDataTypeUtils(unittest.TestCase):
+    def test_determine_python_ares_data_type(self):
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type("string"), AresDataType.STRING)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type(True), AresDataType.BOOLEAN)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type(123), AresDataType.NUMBER)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type(12.34), AresDataType.NUMBER)
+        
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type(["a", "b"]), AresDataType.STRING_ARRAY)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type([1, 2.0]), AresDataType.NUMBER_ARRAY)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type([True, False]), AresDataType.LIST)
+        self.assertEqual(ares_data_type_utils.determine_python_ares_data_type([1, "a"]), AresDataType.LIST)
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

pyares-0.3.1/tests/test_ares_struct_utils.py

@@ -0,0 +1,81 @@
+import unittest
+from PyAres.Utils import ares_struct_utils
+from ares_datamodel import ares_struct_pb2
+
+class TestAresStructUtils(unittest.TestCase):
+    def test_create_string_struct(self):
+        s = ares_struct_utils.create_string_struct("key", "value")
+        self.assertEqual(s.fields["key"].string_value, "value")
+
+    def test_create_number_struct(self):
+        s = ares_struct_utils.create_number_struct("key", 123)
+        self.assertEqual(s.fields["key"].number_value, 123)
+
+    def test_create_bool_struct(self):
+        s = ares_struct_utils.create_bool_struct("key", True)
+        self.assertEqual(s.fields["key"].bool_value, True)
+
+    def test_create_null_struct(self):
+        s = ares_struct_utils.create_null_struct("key")
+        self.assertTrue(s.fields["key"].HasField("null_value"))
+
+    def test_create_string_array_struct(self):
+        s = ares_struct_utils.create_string_array_struct("key", ["a", "b"])
+        self.assertEqual(s.fields["key"].string_array_value.strings, ["a", "b"])
+
+    def test_create_number_array_struct(self):
+        s = ares_struct_utils.create_number_array_struct("key", [1, 2.0])
+        self.assertEqual(s.fields["key"].number_array_value.numbers, [1, 2.0])
+
+    def test_create_bytes_array_struct(self):
+        s = ares_struct_utils.create_bytes_array_struct("key", b"bytes")
+        self.assertEqual(s.fields["key"].bytes_value, b"bytes")
+
+    def test_create_ares_struct_inference(self):
+        # Test type inference in create_ares_struct
+        s_str = ares_struct_utils.create_ares_struct("k", "v")
+        self.assertEqual(s_str.fields["k"].string_value, "v")
+
+        s_num = ares_struct_utils.create_ares_struct("k", 10)
+        self.assertEqual(s_num.fields["k"].number_value, 10)
+
+        s_bool = ares_struct_utils.create_ares_struct("k", False)
+        self.assertEqual(s_bool.fields["k"].bool_value, False)
+
+        s_bytes = ares_struct_utils.create_ares_struct("k", b"123")
+        self.assertEqual(s_bytes.fields["k"].bytes_value, b"123")
+
+        s_list_str = ares_struct_utils.create_ares_struct("k", ["a", "b"])
+        self.assertEqual(s_list_str.fields["k"].string_array_value.strings, ["a", "b"])
+
+        s_list_num = ares_struct_utils.create_ares_struct("k", [1, 2])
+        self.assertEqual(s_list_num.fields["k"].number_array_value.numbers, [1, 2])
+
+        s_list_bool = ares_struct_utils.create_ares_struct("k", [True, False])
+        self.assertEqual(s_list_bool.fields["k"].list_value.values[0].bool_value, True)
+
+        s_empty = ares_struct_utils.create_ares_struct("k", [])
+        self.assertTrue(s_empty.fields["k"].HasField("null_value"))
+
+    def test_dict_conversions(self):
+        py_dict = {
+            "str": "val",
+            "num": 1.0,
+            "bool": True,
+            "list": [1, 2]
+        }
+        struct_pb = ares_struct_pb2.AresStruct()
+        ares_struct_utils.dict_to_ares_struct(py_dict, struct_pb)
+        
+        self.assertEqual(struct_pb.fields["str"].string_value, "val")
+        self.assertEqual(struct_pb.fields["num"].number_value, 1.0)
+        
+        # Round trip
+        new_dict = ares_struct_utils.ares_struct_to_dict(struct_pb)
+        self.assertEqual(new_dict["str"], "val")
+        self.assertEqual(new_dict["num"], 1.0)
+        self.assertEqual(new_dict["bool"], True)
+        self.assertEqual(new_dict["list"], [1, 2])
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

pyares-0.3.1/tests/test_ares_value_type_conversions.py

@@ -0,0 +1,75 @@
+import unittest
+from PyAres.Utils import ares_value_utils
+
+class TestAresValueTypeConversions(unittest.TestCase):
+  def test_float_ares_value(self):
+    original_float = 0.0
+    float_value = ares_value_utils.create_ares_value(original_float)
+    self.assertEqual(float_value.number_value, original_float)    
+
+  def test_int_ares_value(self):
+    original_int = 0
+    int_value = ares_value_utils.create_ares_value(original_int)
+    self.assertEqual(int_value.number_value, original_int)
+
+  def test_negative_ares_value(self):
+    original_num = -1.0
+    negative_value = ares_value_utils.create_ares_value(original_num)
+    self.assertEqual(negative_value.number_value, original_num)
+
+  def test_string_ares_value(self):
+    original_str = "STRING"
+    str_value = ares_value_utils.create_ares_value(original_str)
+    self.assertEqual(str_value.string_value, original_str)
+
+  def test_bool_ares_value(self):
+    original_bool = True
+    bool_value = ares_value_utils.create_ares_value(original_bool)
+    self.assertEqual(bool_value.bool_value, original_bool)
+
+  def test_bytes_ares_value(self):
+    original_bytes = b"BYTES"
+    bytes_value = ares_value_utils.create_ares_value(original_bytes)
+    self.assertEqual(bytes_value.bytes_value, original_bytes)
+
+  def test_number_array_ares_value(self):
+    original_list = [1.0, 2.0, 3.0]
+    list_value = ares_value_utils.create_ares_value(original_list)
+    self.assertEqual(list_value.number_array_value.numbers, original_list)
+
+  def test_string_array_ares_value(self):
+    original_list = ["one", "two", "three"]
+    list_value = ares_value_utils.create_ares_value(original_list)
+    self.assertEqual(list_value.string_array_value.strings, original_list)
+
+  def test_bool_array_ares_value(self):
+    original_list = [True, False, True]
+    list_value = ares_value_utils.create_ares_value(original_list)
+    self.assertEqual(list_value.WhichOneof("kind"), "list_value")
+    self.assertEqual(len(list_value.list_value.values), 3)
+    self.assertEqual(list_value.list_value.values[0].bool_value, True)
+
+  def test_mixed_list_ares_value(self):
+    mixed_list = [1, "two"]
+    list_value = ares_value_utils.create_ares_value(mixed_list)
+    self.assertEqual(list_value.WhichOneof("kind"), "list_value")
+    self.assertEqual(len(list_value.list_value.values), 2)
+    self.assertEqual(list_value.list_value.values[0].number_value, 1)
+    self.assertEqual(list_value.list_value.values[1].string_value, "two")
+
+    # Unsupported type should return null value
+    class Unsupported:
+      pass
+    unsupported = Unsupported()
+    null_value = ares_value_utils.create_ares_value(unsupported)
+    self.assertEqual(null_value.WhichOneof("kind"), "null_value")
+
+  def test_struct_ares_value(self):
+    original_dict = {"key": "value", "nested": {"inner": 123.0}}
+    struct_value = ares_value_utils.create_ares_value(original_dict)
+    self.assertEqual(struct_value.WhichOneof("kind"), "struct_value")
+    self.assertEqual(struct_value.struct_value.fields["key"].string_value, "value")
+    self.assertEqual(struct_value.struct_value.fields["nested"].struct_value.fields["inner"].number_value, 123.0)
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

pyares-0.2.2/PyAres/Utils/ares_data_schema_utils.py

@@ -1,36 +0,0 @@
-from typing import Union
-from ares_datamodel import ares_data_schema_pb2
-from ..Models import ares_data_models
-
-def create_settings_schema_entry(
-    setting_type: ares_data_models.AresDataType, 
-    optional: bool, 
-    choices: Union[list[str], list[int], list[float]]) -> ares_data_schema_pb2.SchemaEntry:
-    """
-    Takes in an AresSetting object and converts it into the protobuf SchemaEntry message.
-
-    Args:
-        new_setting: The AresSetting object that provides all the details around the setting implementation.
-
-    Returns:
-        (SchemaEntry): A new SchemaEntry message.
-    """
-
-    if(isinstance(choices, list)):
-        if(len(choices) == 0):
-            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
-
-        elif(all(isinstance(item, str) for item in choices)):
-            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
-            schema_entry.string_choices.strings.extend(choices)
-    
-        elif(all(isinstance(item, (int, float)) for item in choices)):
-            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
-            schema_entry.number_choices.numbers.extend(choices)
-
-        else:
-            schema_entry = ares_data_schema_pb2.SchemaEntry(type=setting_type.value, optional=optional)
-            
-
-    return schema_entry
-

pyares-0.2.2/poetry.lock

@@ -1,188 +0,0 @@
-# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand.
-
-[[package]]
-name = "ares-datamodel"
-version = "0.7.0b5"
-description = "Datamodel/messaging for ARES communications"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "ares_datamodel-0.7.0b5-py3-none-any.whl", hash = "sha256:42c02a60a9803ecb6f3e13650b530df20c2ad0155d3a6d2507e4817470de9557"},
-    {file = "ares_datamodel-0.7.0b5.tar.gz", hash = "sha256:758ac520bd1119558dc31059b7b4d23685c00b83a9867b6a9de3a791f6198cf0"},
-]
-
-[[package]]
-name = "grpcio"
-version = "1.72.0rc1"
-description = "HTTP/2-based RPC framework"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "grpcio-1.72.0rc1-cp310-cp310-linux_armv7l.whl", hash = "sha256:db7db4b246a7fb21aeb70e7220be480948aa9c535eaa777ea0c840416ed8cac9"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:baf028e61662fd320c18fb50070b6e330fa24b2b3a4d113f4d57b41e0f5b5873"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:bf84cf17dfbf49ebe11b081b7a3c83b23625a80c979741e2e98b0ddb41080397"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3fd6f8700d34754b32d13af234da2e413f408c8b741c8039f11beb06d53c3f6a"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f05d243b8d814dd1c6fca19e4e0c5986fc70e2c3aa29e2c7c67e877e4c03ede6"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:390a70394e2c315d7c480496db259ec16c00baeebf759c8967247269f0fee981"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b08973c62eda11343e7131d78635d50ae0c138a8f39eb817ca83cca842527d04"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ce539397a258af1dee26118c40327004d023617bc99493baaf8e7938491f7361"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-win32.whl", hash = "sha256:4f97f628095bbdf6d4c2c15c1bc18f0514f90781528bc6082bb697ccc71d4f42"},
-    {file = "grpcio-1.72.0rc1-cp310-cp310-win_amd64.whl", hash = "sha256:dbcdf7a5463b61fca1586b54f7ea3c9dfd159f535224f457ae307f52d8d4a839"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-linux_armv7l.whl", hash = "sha256:23ebb3947783f10fec3e1d0b29b94db8e72f721900d1dd9c1d6db5876da69066"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:fd96b20846907ed4cd95bf1d628f16732f450114bde897eedb323fc3bc1eddb3"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:6df1ba4a5f5793ae210699e1b1745f77a4ac17f73510fc36ee12c215f02523b4"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3398957c611f0af7cee4fdd34268b6664be8689eae0327440efb794e544908b"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ef66029da9cbe94ba3047c1b04653e1d5096ca8d036eb6e24092f0e847d2c4f"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6566e3e3458805381f8714492e8f559f082f8955ccd1c98d71f8afc0612dc841"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3c799bfa92450e95d3f1f9cc4b7d8cbefc8bd4356d3f6573d2fb5e698353192a"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a251992531f3b16be3c013ec45a9caa69ecfe9b45335652d5681659f6d117233"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-win32.whl", hash = "sha256:c9e5f2c628dedf0886b774eee17e003a043941024e68ee2ebe76be6981a7baab"},
-    {file = "grpcio-1.72.0rc1-cp311-cp311-win_amd64.whl", hash = "sha256:8b9c0a84ff584da3f5c0cb04ee3d87c0bc70d41ab5a21d3b943963a94c622892"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-linux_armv7l.whl", hash = "sha256:188ac9d8cb05c250e212ba946a65a8541419bdfd803373d6b7fb8b10fe5ff991"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:8bd956711dc21235bc78a70bf04a28b3f747c6576b9bb79362803707fec9f705"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:b032b9cbb325e28ff847b6aae1df5a090aa49b682dc80c926b24a96de43c01aa"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ca12a4388a40eb0411264af291184e2cca38176996b591ac047844abd81d40b"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7cefd52f392f4d6747b401f825901c48176737f7b03b17be0a0a638da194749"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1a24408fb051b70efa440b95f7e1acbb1c3067609934aa53a953d8d2cfc4d824"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:c7b37608d14792d3dacb9aba55b96a17a074e139c4567b0ac5c1926302add910"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:81ca42a96299ca617f3bc7b60660f15cabb98de6fce440ecd4d0640a5554345f"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-win32.whl", hash = "sha256:9ff2ef2a553d4edc8c620df3735b15a1e7dc05a60262e8c28445f2676fb09189"},
-    {file = "grpcio-1.72.0rc1-cp312-cp312-win_amd64.whl", hash = "sha256:3c9a6613662591c198d9e4e499f3336bc5c1c0e3fe3f0922cf48e74b37b3dcd1"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-linux_armv7l.whl", hash = "sha256:995e3e5c43cab6d0f1922b43b3c01a2624a4497ce91c3124e807497654301c59"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:8dfb0ff2ddd708dbecdffa37245b79aef707e789ffb0fc6a8be01608d982afcd"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:7e08eb53d6123995da63df90ce50e5b834de0a8ebfb1a3ac0890a2e246d2771c"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:71cb52c0956fe7868692b490fda341a52d8187fab94e1136f5bd253c8e3560ac"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dcf76ce8d4a6829f112ad88c4e6d528dbef922e01834d4a5cc3718bf599f7e84"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:8852b6234a52b6b694a5f9a5a687d59127b3e71c8e345eebd6d483abbc412217"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:d1a0fee8420d9e453dc8cba1c7c067ca2d3054487cb6616ab8dad41f15e57465"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:a13149f4fd3904093fa2dba484744dd7205f536650a533ab24dd95cca393c14c"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-win32.whl", hash = "sha256:cebe148511a1965363fc6aafd60a488fe9dc5d74dd92a59a8ecba66ddd53c573"},
-    {file = "grpcio-1.72.0rc1-cp313-cp313-win_amd64.whl", hash = "sha256:843352c352970a1df5bbf7da68d2770781f4bff2c85a4a0d20cc6eaaadf26e59"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-linux_armv7l.whl", hash = "sha256:2083c0cdff47ff7d4b093d05d703baeeef8db3b2c1f43c9f9d4288a99e444cdd"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:42df7e0f9d66f5c9b246d8e1da74605bce27b10dec20b6fc204edd6e7178da2d"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:1190c2e4f221b5bd0e6eba3e44d6758ef48eeb2216dcb9734c158e8a5d8ce6a3"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6d6c8d2ea63e1cdaaa81271e5c867fcd9732050324df372ff9d3163968be68c8"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f6ee161b9d112232e5d6be437bf56383dca2334bd17e8b7a4a3f97f33722bdd"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9abbdf945e3b151603d642f2bc7a637b87af2e3480ed047689bad9eb4fa9c712"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2edab5d26319a1fed695ec658efe3846b75e0c7f3a6202b042099c9b11dc10fd"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:03b46e0041bee18a786ccef978bc29a26e4bd1b73a6ca0b21252387167843ff1"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-win32.whl", hash = "sha256:9b861cbfb63433e02b52f9971644095bec4a5fcd1e4d3f94e18cfad38f649d53"},
-    {file = "grpcio-1.72.0rc1-cp39-cp39-win_amd64.whl", hash = "sha256:2416792a567cba9f92bffc1a55ce0f2c8106956a2e32bfe8a22a8094a56b7108"},
-    {file = "grpcio-1.72.0rc1.tar.gz", hash = "sha256:221793dccd3332060f426975a041d319d6d57323d857d4afc25257ec4a5a67f3"},
-]
-
-[package.extras]
-protobuf = ["grpcio-tools (>=1.72.0rc1)"]
-
-[[package]]
-name = "grpcio-tools"
-version = "1.72.0rc1"
-description = "Protobuf code generator for gRPC"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-linux_armv7l.whl", hash = "sha256:e52e94faa43461e74969204b4ec59d1254aa6c7e800e3c25bdf2b5d54b84909c"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:586ecf02e78377b3c0422ab056328b135cd67e4a0f7339d3dca0016329524f92"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:126a01bdf963138d07df41ffe9962ccd2c31f87d00b59cb7474a8caccd273e5b"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca628b68e2641fb185723bb82c151350dcb718ac8c710ec444fe51c750172f9d"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f97522654a2f46b6e2a3efd859cc9a87970402dba61c29d721b388149d0df3f"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d22850ebe6ef42ff7332f6ff241c0414023218e294ec6df31b2f857afb9ffa4b"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0c2bed940f7bfe7f493a47496fb1eb93cc8c38cdcf0acda268f6127d94e4c8a9"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2d933a40c11e26822c1f49bf18b0fe2f69470f39b5e623974829e982e9f892b0"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-win32.whl", hash = "sha256:c0964c6b48e092b2d78ee0b623162c374d7ed608d8e11d2276b12f9216c69eea"},
-    {file = "grpcio_tools-1.72.0rc1-cp310-cp310-win_amd64.whl", hash = "sha256:ea2c75c55bd78fa8829bdfc6aa20ce99b9a96c2d7493baa3bacf4021e03e2e48"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-linux_armv7l.whl", hash = "sha256:c1e604edb61e465e2aceb0dd3d380f3157a3dc9194389161fc55e4eefa712336"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:858083b368e52d291cd7e178fa16fc477f86af1e7d42fd722d04b3758f3bf91d"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:b1b456d3a72e5330a75e31cad454e7d966fa7a91de09506c6081d543163ad3be"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c350ab4bea63422cb9a945823c51fdb90fac81716e0cd1ea104af7a16de8a2ae"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65fe8bc37f74c49376d589aaea3c00f6652f870d58c087b63cd8ece890de2300"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7848a82c1dce3ac5f140a5d71081a9650c0dac1b9ceaef73e49353ce9df67ca8"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3b24790f9c58ecc4574b2ac91d5cb36a3776b06afafb4eca92780fe3b3476bef"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:775d0acf3934a1d8dbab6253065c2a1b5279ea06f3448b020d0045947a14b15a"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-win32.whl", hash = "sha256:acdf6b7183deac8d6225e49c94bae03cd9e0afc593c3ba8783174e7820ef886d"},
-    {file = "grpcio_tools-1.72.0rc1-cp311-cp311-win_amd64.whl", hash = "sha256:437d41f2b9046ece5dabc37911d0a3f753bd9522c41f8d10cddc87706926e1e2"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-linux_armv7l.whl", hash = "sha256:fa064454883b6f3eead90d47f1857ba5a604166d6cd2f5188af4203d195f8a2e"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:1a39f725d1a29758cbd67e8e0b3ab4e39ad6add3b1876cf782056bdcb01c6e0d"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:0660cea4503408b9cfea96eb52e5b18c9bf2066d7217985a0fcc4f28b0e55495"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9d76785c43d7919b44fbf7b1cfd6b485c2c6b6dedc3a2174145da25752154e4"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ba91a442526fc44e0b9228f0e32b06d34019aacf0e367f1a89cfbeb15bbf0c1"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c545042d8e9d1a36da72e38c7445fb285427a28319e4a47b67b729d0bdf822e1"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:701690d370b5722285f150ccd73069dc1ce5deed7feffa9b58278957d20301da"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9ffaf6b6255244a1bff601f1046dd763d4652f8cffb16c09831c91afc7e2a648"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-win32.whl", hash = "sha256:397e251114e4cc3f9ffd948ce7438aa419611f90b64cd6d49cb048ac100fd72c"},
-    {file = "grpcio_tools-1.72.0rc1-cp312-cp312-win_amd64.whl", hash = "sha256:e41186388cf8e615c7caf0dd756efffee59d3b590fe06c4d44a3a2149efb9e03"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-linux_armv7l.whl", hash = "sha256:2444addb5762446ef9035d0dd8de207b80f6c2693b479034fbe79b5b647de795"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:339df6909033612560eb3a8665443fea7826289818c69af502bffcde4c23a224"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:b7ce79173fe9e1064b40dd1f1a3ab3ba263085751806285cb4f1e47fcb9a3043"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7974b72c4b543ef574657f535f4c593e40f2f5ab43210d1bce8553597ba95e5"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4884f08bfaee04c5d2221c0a99283220b01a9196d29a97f76a1a945b1e54656b"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:14c647acf2a27bff0051c77b3284969753f94a78c7c7b025ac216bcb651a5ea9"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:1f1f2da48e460a642d01fa1fd9e32daf17b49ae443c878be5ec5a5fa0ce6acae"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:bfeebd25f1f1d0d2e14f18c88088e86ee5ca67b7261bf8a35ca9ff6cf65311b0"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-win32.whl", hash = "sha256:57df96d9ebfe0f77bec7ecf43dc6c3b922b40f2a41543c17ee3bee9e1e3946b1"},
-    {file = "grpcio_tools-1.72.0rc1-cp313-cp313-win_amd64.whl", hash = "sha256:f9ae32f9037cab9f135bd551936eeb4f92e2a0b9ff6511cc570f5188ab8631dc"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-linux_armv7l.whl", hash = "sha256:73911e370d0a2b389ef3969ac398ec49dd12416aa60c789efe13bf7de5df7671"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:1b6fbf6c5132bf4770960575e7198de3883bdacffa15714f23c480980c1e2800"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:d5abfbf37042aee8058cd9554c10e2fafcfc4905daea1947879f26846d8ee673"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6b4feb97c6ee521f80fec48708405e2b202618a582f650e7dc999d3e44342351"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e3a18ff852c02b9673b7a2fa8a85f147dcb564dff7bad7990304963941650d"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0aa493aa4f98d3e7fed9593a6c7fbcae157338d496669007ceddca4fcf06dfb"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:12f68f42c0e7e72f2e93c6c962d9c7f8b74528b7afb8920f7243df49ea6de6f6"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b056427fcc230447ee033b561dd6f60015634529738764cd22ad6e4351d51bad"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-win32.whl", hash = "sha256:0a460a77761bceeaeac3a9c34ec15eca3302e94d83aa031d2a0fb8539fd347f2"},
-    {file = "grpcio_tools-1.72.0rc1-cp39-cp39-win_amd64.whl", hash = "sha256:f165c4829c2d7da787e2c693cb73b75c92586e668e1dcbf8e1a90814d7af37e8"},
-    {file = "grpcio_tools-1.72.0rc1.tar.gz", hash = "sha256:d073367bcec01f8cc89bcc37bb918174ea8384fcde83645c2506f4cc36a12ba4"},
-]
-
-[package.dependencies]
-grpcio = ">=1.72.0rc1"
-protobuf = ">=6.30.0,<7.0dev"
-setuptools = "*"
-
-[[package]]
-name = "protobuf"
-version = "6.30.2"
-description = ""
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "protobuf-6.30.2-cp310-abi3-win32.whl", hash = "sha256:b12ef7df7b9329886e66404bef5e9ce6a26b54069d7f7436a0853ccdeb91c103"},
-    {file = "protobuf-6.30.2-cp310-abi3-win_amd64.whl", hash = "sha256:7653c99774f73fe6b9301b87da52af0e69783a2e371e8b599b3e9cb4da4b12b9"},
-    {file = "protobuf-6.30.2-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:0eb523c550a66a09a0c20f86dd554afbf4d32b02af34ae53d93268c1f73bc65b"},
-    {file = "protobuf-6.30.2-cp39-abi3-manylinux2014_aarch64.whl", hash = "sha256:50f32cc9fd9cb09c783ebc275611b4f19dfdfb68d1ee55d2f0c7fa040df96815"},
-    {file = "protobuf-6.30.2-cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:4f6c687ae8efae6cf6093389a596548214467778146b7245e886f35e1485315d"},
-    {file = "protobuf-6.30.2-cp39-cp39-win32.whl", hash = "sha256:524afedc03b31b15586ca7f64d877a98b184f007180ce25183d1a5cb230ee72b"},
-    {file = "protobuf-6.30.2-cp39-cp39-win_amd64.whl", hash = "sha256:acec579c39c88bd8fbbacab1b8052c793efe83a0a5bd99db4a31423a25c0a0e2"},
-    {file = "protobuf-6.30.2-py3-none-any.whl", hash = "sha256:ae86b030e69a98e08c77beab574cbcb9fff6d031d57209f574a5aea1445f4b51"},
-    {file = "protobuf-6.30.2.tar.gz", hash = "sha256:35c859ae076d8c56054c25b59e5e59638d86545ed6e2b6efac6be0b6ea3ba048"},
-]
-
-[[package]]
-name = "setuptools"
-version = "80.1.0"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "setuptools-80.1.0-py3-none-any.whl", hash = "sha256:ea0e7655c05b74819f82e76e11a85b31779fee7c4969e82f72bab0664e8317e4"},
-    {file = "setuptools-80.1.0.tar.gz", hash = "sha256:2e308396e1d83de287ada2c2fd6e64286008fe6aca5008e0b6a8cb0e2c86eedd"},
-]
-
-[package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]
-core = ["importlib_metadata (>=6) ; python_version < \"3.10\"", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
-cover = ["pytest-cov"]
-doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
-enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
-
-[metadata]
-lock-version = "2.1"
-python-versions = ">= 3.9"
-content-hash = "01e6ac2d2a5f6b5e0bda939c88ab4dd01b0d2c9f9041ebcdf6483df7c07c06bf"