sapiopycommons 2025.7.22a651__py3-none-any.whl → 2025.7.30a660__py3-none-any.whl

sapiopycommons/ai/protobuf_utils.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from sapiopylib.rest.pojo.Sort import SortDirection
 from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition, FieldType, \
     VeloxBooleanFieldDefinition, VeloxDateFieldDefinition, VeloxAccessionFieldDefinition, VeloxActionFieldDefinition, \
@@ -435,24 +433,23 @@ class ProtobufUtils:
         )
 
     @staticmethod
-    def field_pbo_to_value(field: Any, value: FieldValuePbo) -> FieldValue:
+    def field_pbo_to_value(value: FieldValuePbo) -> FieldValue:
         """
-        Convert a StepRecordFieldValue to its corresponding Python value based on the field type.
+        Convert a StepRecordFieldValue to its corresponding Python value.
 
-        :param field: The VeloxFieldDefPbo or FieldTypePbo object for the given value.
         :param value: The StepRecordFieldValue object.
         :return: The corresponding Python value.
         """
-        field_type = field.data_field_type if hasattr(field, "data_field_type") else field
-        match field_type:
-            case FieldTypePbo.BOOLEAN:
-                return value.bool_value
-            case FieldTypePbo.DOUBLE:
-                return value.double_value
-            case FieldTypePbo.ENUM | FieldTypePbo.INTEGER | FieldTypePbo.LONG | FieldTypePbo.SHORT:
-                return value.int_value
-            case _:
-                return value.string_value
+        if value.HasField("string_value"):
+            return value.string_value
+        elif value.HasField("int_value"):
+            return value.int_value
+        elif value.HasField("double_value"):
+            return value.double_value
+        elif value.HasField("bool_value"):
+            return value.bool_value
+        else:
+            return None
 
     @staticmethod
     def field_def_pbo_to_default_value(field_def: VeloxFieldDefPbo) -> FieldValue:

sapiopycommons/ai/test_client.py

@@ -1,11 +1,10 @@
 import base64
 import json
-from typing import Mapping, Any
+from typing import Any
 
 import grpc
 from sapiopylib.rest.User import SapioUser
 
-from sapiopycommons.ai.api.fielddefinitions.proto.fields_pb2 import FieldValuePbo
 from sapiopycommons.ai.api.plan.tool.proto.entry_pb2 import DataTypePbo, StepBinaryContainerPbo, StepCsvRowPbo, \
     StepCsvHeaderRowPbo, StepCsvContainerPbo, StepJsonContainerPbo, StepImageContainerPbo, StepTextContainerPbo, \
     StepItemContainerPbo, StepInputBatchPbo
@@ -13,6 +12,8 @@ from sapiopycommons.ai.api.plan.tool.proto.tool_pb2 import ProcessStepResponsePb
     ToolDetailsRequestPbo, ToolDetailsResponsePbo, ProcessStepResponseStatusPbo
 from sapiopycommons.ai.api.plan.tool.proto.tool_pb2_grpc import ToolServiceStub
 from sapiopycommons.ai.api.session.proto.sapio_conn_info_pb2 import SapioConnectionInfoPbo, SapioUserSecretTypePbo
+from sapiopycommons.ai.protobuf_utils import ProtobufUtils
+from sapiopycommons.general.aliases import FieldValue
 
 
 # FR-47422: Created class.
@@ -32,7 +33,7 @@ class ToolOutput:
     image_output: list[bytes]
     text_output: list[str]
 
-    new_records: list[Mapping[str, FieldValuePbo]]
+    new_records: list[dict[str, FieldValue]]
 
     logs: list[str]
 
@@ -51,28 +52,35 @@ class ToolOutput:
         ret_val += f"\tStatus: {self.status}\n"
         ret_val += f"\tMessage: {self.message}\n"
         ret_val += "-" * 25 + "\n"
+
         ret_val += f"Binary Output: {len(self.binary_output)} item(s)\n"
         for binary in self.binary_output:
             ret_val += f"\t{len(binary)} byte(s)\n"
             ret_val += f"\t{binary[:50]}...\n"
+
         ret_val += f"CSV Output: {len(self.csv_output)} item(s)\n"
         if self.csv_output:
             ret_val += f"\tHeaders: {', '.join(self.csv_output[0].keys())}\n"
             for i, csv_row in enumerate(self.csv_output):
                 ret_val += f"\t{i}: {', '.join(f'{v}' for k, v in csv_row.items())}\n"
+
         ret_val += f"JSON Output: {len(self.json_output)} item(s)\n"
         if self.json_output:
-            ret_val += f"\t{json.dumps(self.json_output, indent=2)}\n"
+            ret_val += f"{json.dumps(self.json_output, indent=2)}\n"
+
         ret_val += f"Image Output: {len(self.image_output)} item(s)\n"
         for image in self.image_output:
             ret_val += f"\t{len(image)} bytes\n"
             ret_val += f"\t{image[:50]}...\n"
+
         ret_val += f"Text Output: {len(self.text_output)} item(s)\n"
         for text in self.text_output:
-            ret_val += f"\t{text}...\n"
+            ret_val += f"\t{text}\n"
+
         ret_val += f"New Records: {len(self.new_records)} item(s)\n"
         for record in self.new_records:
-            ret_val += f"\t{json.dumps(record, indent=2)}\n"
+            ret_val += f"{json.dumps(record, indent=2)}\n"
+
         ret_val += f"Logs: {len(self.logs)} item(s)\n"
         for log in self.logs:
             ret_val += f"\t{log}\n"
@@ -237,16 +245,17 @@ class TestClient:
                     sapio_user=self.connection,
                     tool_name=tool_name,
                     config_field_values=self._config_fields,
+                    dry_run=is_dry_run,
+                    verbose_logging=True,
                     input=[
                         StepInputBatchPbo(is_partial=False, item_container=item)
                         for item in self._request_inputs
-                    ],
-                    dry_run=is_dry_run,
-                    verbose_logging=True
+                    ]
                 )
             )
 
             results = ToolOutput(tool_name)
+
             match response.status:
                 case ProcessStepResponseStatusPbo.SUCCESS:
                     results.status = "Success"
@@ -255,6 +264,7 @@ class TestClient:
                 case _:
                     results.status = "Unknown"
             results.message = response.status_message
+
             for item in response.output:
                 container = item.item_container
 
@@ -269,7 +279,8 @@ class TestClient:
                 results.text_output.extend(container.text_container.items)
 
             for record in response.new_records:
-                results.new_records.append(record.fields)
+                field_map: dict[str, Any] = {x: ProtobufUtils.field_pbo_to_value(y) for x, y in record.fields.items()}
+                results.new_records.append(field_map)
 
             results.logs.extend(response.log)
 

sapiopycommons/ai/tool_service_base.py

@@ -289,14 +289,18 @@ class ToolServiceBase(ToolServiceServicer, ABC):
             generated by the tool.
         """
         # Locate the tool named in the request.
-        tool: ToolBase | None = None
-        for t in self.register_tools():
-            if t.name() == request.tool_name:
-                tool = t()
-                break
-        if not tool:
-            return False, f"Tool \"{request.tool_name}\" not found in the registered tools for this service.", [], []
-
+        find_tool: str = request.tool_name
+        registered_tools: dict[str, type[ToolBase]] = {t.name(): t for t in self.register_tools()}
+        if find_tool not in registered_tools:
+            # If the tool is not found, list all of the registered tools for this service so that the LLM can correct
+            # the tool it is requesting.
+            all_tool_names: str = "\n".join(registered_tools.keys())
+            msg: str = (f"Tool \"{find_tool}\" not found in the registered tools for this service. The registered tools "
+                        f"for this service are: \n{all_tool_names}")
+            return False, msg, [], []
+
+        # Instantiate the tool class.
+        tool: ToolBase = registered_tools[find_tool]()
         try:
             # Setup the tool with details from the request.
             tool.setup(user, request, context)
@@ -893,7 +897,11 @@ class ToolBase(ABC):
             if field_name not in raw_configs:
                 config_fields[field_name] = ProtobufUtils.field_def_pbo_to_default_value(field_def)
             else:
-                config_fields[field_name] = ProtobufUtils.field_pbo_to_value(field_def, raw_configs[field_name])
+                field_value: Any = ProtobufUtils.field_pbo_to_value(raw_configs[field_name])
+                if field_value is not None:
+                    config_fields[field_name] = field_value
+                else:
+                    config_fields[field_name] = ProtobufUtils.field_def_pbo_to_default_value(field_def)
         return config_fields
 
     @staticmethod

{sapiopycommons-2025.7.22a651.dist-info → sapiopycommons-2025.7.30a660.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.7.22a651
+Version: 2025.7.30a660
 Summary: Official Sapio Python API Utilities Package
 Project-URL: Homepage, https://github.com/sapiosciences
 Author-email: Jonathan Steck <jsteck@sapiosciences.com>, Yechen Qiao <yqiao@sapiosciences.com>

{sapiopycommons-2025.7.22a651.dist-info → sapiopycommons-2025.7.30a660.dist-info}/RECORD

@@ -1,8 +1,8 @@
 sapiopycommons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sapiopycommons/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sapiopycommons/ai/protobuf_utils.py,sha256=8VYGhAdD731Ojy5PTy61PlTcvfEdydkIdX-4rOFPtxM,24911
-sapiopycommons/ai/test_client.py,sha256=ty-D_xemOiPbp-2hj57aam4-l74HvxKLpPf22i5pPqY,11917
-sapiopycommons/ai/tool_service_base.py,sha256=8SvmxWyu2nKeRjtq5qNAizL-lnfURr4Cbuw4K7hpWxs,41947
+sapiopycommons/ai/protobuf_utils.py,sha256=yJkKolSfH2a-zk1k7juGh9-xQz6mmsoaJtM91meQIgk,24645
+sapiopycommons/ai/test_client.py,sha256=TBlXeWVAx2OUtCZNry8dNjY9I3NOkySYj_QdQd7xx1A,12050
+sapiopycommons/ai/tool_service_base.py,sha256=n_8UiLD6vuvkobJAHEGybvq5AY-itFCN1IjTiuyjmrU,42584
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2.py,sha256=YcZjb_YM-XeLErM8hEC_S7vGMVGvcXAMGs2b-u5zvOE,2377
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2.pyi,sha256=FwtXmNAf7iYGEFm4kbqb04v77jNHbZg18ZmEDhle_bU,1444
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2_grpc.py,sha256=wPImJPdCUZNVEVoUWzsba9kGIXjEKPdUkawP5SnVyiU,932
@@ -90,7 +90,7 @@ sapiopycommons/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 sapiopycommons/webhook/webhook_context.py,sha256=D793uLsb1691SalaPnBUk3rOSxn_hYLhdvkaIxjNXss,1909
 sapiopycommons/webhook/webhook_handlers.py,sha256=7o_wXOruhT9auNh8OfhJAh4WhhiPKij67FMBSpGPICc,39939
 sapiopycommons/webhook/webservice_handlers.py,sha256=cvW6Mk_110BzYqkbk63Kg7jWrltBCDALOlkJRu8h4VQ,14300
-sapiopycommons-2025.7.22a651.dist-info/METADATA,sha256=ij7R4yByMHiMKB3NljyGKKk34lsMoufPai-38qbEB3A,3143
-sapiopycommons-2025.7.22a651.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sapiopycommons-2025.7.22a651.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2025.7.22a651.dist-info/RECORD,,
+sapiopycommons-2025.7.30a660.dist-info/METADATA,sha256=ARGB8aFkiawv1p5UphWDTJ-5xpFvVjZqoaGLe09mwgE,3143
+sapiopycommons-2025.7.30a660.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+sapiopycommons-2025.7.30a660.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2025.7.30a660.dist-info/RECORD,,