sapiopycommons 2025.7.23a659__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, \

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/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

{sapiopycommons-2025.7.23a659.dist-info → sapiopycommons-2025.7.30a660.dist-info}/METADATA

@@ -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.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=C0e5NIr4eodfAkUm9QciKe7AT4hBlnJFDdChBJOMxVo,24669
-sapiopycommons/ai/test_client.py,sha256=BEA6RQRBmHPdshmP7bI0fhoEsGPGlUB0ae095YPggGg,12141
-sapiopycommons/ai/tool_service_base.py,sha256=nAMy3Ch4juCTm3FQI6TAo3oDepOaR89j9bUJ8lNO3lM,41936
+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.23a659.dist-info/METADATA,sha256=T5mZ0vKZqHkUwtjKVc9Mlxj5eGLfrpPgcU-cwKUMUok,3143
-sapiopycommons-2025.7.23a659.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sapiopycommons-2025.7.23a659.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2025.7.23a659.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,,