sapiopycommons 2025.7.23a659__tar.gz → 2025.7.30a660__tar.gz

{sapiopycommons-2025.7.23a659 → sapiopycommons-2025.7.30a660}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.7.23a659
+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.23a659 → sapiopycommons-2025.7.30a660}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sapiopycommons"
-version='2025.07.23a659'
+version='2025.07.30a660'
 authors = [
     { name="Jonathan Steck", email="jsteck@sapiosciences.com" },
     { name="Yechen Qiao", email="yqiao@sapiosciences.com" },

{sapiopycommons-2025.7.23a659 → sapiopycommons-2025.7.30a660}/src/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, \

{sapiopycommons-2025.7.23a659 → sapiopycommons-2025.7.30a660}/src/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

{sapiopycommons-2025.7.23a659 → sapiopycommons-2025.7.30a660}/src/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(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