sapiopycommons 2025.7.22a637__py3-none-any.whl → 2025.7.22a639__py3-none-any.whl

sapiopycommons/ai/test_client.py

@@ -110,7 +110,7 @@ class TestClient:
             self.connection.secret_type = SapioUserSecretTypePbo.PASSWORD
             self.connection.secret = "Basic " + base64.b64encode(f'{user.username}:{user.password}'.encode()).decode()
         else:
-            self.connection.secret_type = SapioUserSecretTypePbo.API_TOKEN
+            self.connection.secret_type = SapioUserSecretTypePbo.SESSION_TOKEN
             self.connection.secret = user.api_token if user and user.api_token else "test_api_token"
 
     def add_binary_input(self, input_data: list[bytes]) -> None:

sapiopycommons/ai/tool_service_base.py

@@ -200,8 +200,10 @@ class ToolServiceBase(ToolServiceServicer, ABC):
         try:
             # Get the tool details from the registered tools.
             details: list[ToolDetailsPbo] = []
-            for tool in self._initialize_tools():
-                details.append(tool.to_pbo())
+            for tool in self.register_tools():
+                details.append(tool().to_pbo())
+            if not details:
+                raise Exception("No tools registered with this service.")
             return ToolDetailsResponsePbo(tool_framework_version=self.tool_version(), tool_details=details)
         except Exception:
             # Woe to you if you somehow cause an exception to be raised when just initializing your tools.
@@ -274,15 +276,6 @@ class ToolServiceBase(ToolServiceServicer, ABC):
         """
         pass
 
-    def _initialize_tools(self) -> list[ToolBase]:
-        """
-        return: Get instances of the tools registered with this service.
-        """
-        tools: list[ToolBase] = [x() for x in self.register_tools()]
-        if not tools:
-            raise Exception("No tools registered with this service.")
-        return tools
-
     def run(self, user: SapioUser, request: ProcessStepRequestPbo, context: ServicerContext) \
             -> tuple[bool, str, list[SapioToolResult], list[str]]:
         """
@@ -297,9 +290,9 @@ class ToolServiceBase(ToolServiceServicer, ABC):
         """
         # Locate the tool named in the request.
         tool: ToolBase | None = None
-        for t in self._initialize_tools():
-            if t.name == request.tool_name:
-                tool = t
+        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.", [], []
@@ -319,7 +312,7 @@ class ToolServiceBase(ToolServiceServicer, ABC):
             elif success:
                 results = tool.run(user)
                 # Update the status message to reflect the successful execution of the tool.
-                msg = f"{tool.name} successfully completed."
+                msg = f"{tool.name()} successfully completed."
             return success, msg, results, tool.logs
         except Exception as e:
             tool.log_exception("Exception occurred during tool execution.", e)
@@ -330,9 +323,9 @@ class ToolBase(ABC):
     """
     A base class for implementing a tool.
     """
-    name: str
-    description: str
-    data_type_name: str | None
+    _name: str
+    _description: str
+    _data_type_name: str | None
     inputs: list[ToolInputDetailsPbo]
     outputs: list[ToolOutputDetailsPbo]
     configs: list[VeloxFieldDefPbo]
@@ -362,7 +355,6 @@ class ToolBase(ABC):
         pass
 
     @staticmethod
-    @abstractmethod
     def data_type_name() -> str | None:
         """
         :return: The name of the output data type of this tool, if applicable. When this tool returns
@@ -371,14 +363,14 @@ class ToolBase(ABC):
         return None
 
     def __init__(self):
-        self.name = self.name()
-        self.description = self.description()
-        self.data_type_name = self.data_type_name()
+        self._name = self.name()
+        self._description = self.description()
+        self._data_type_name = self.data_type_name()
         self.inputs = []
         self.outputs = []
         self.configs = []
         self.logs = []
-        self.logger = logging.getLogger(f"ToolBase.{self.name}")
+        self.logger = logging.getLogger(f"ToolBase.{self._name}")
         ensure_logger_initialized(self.logger)
 
     def setup(self, user: SapioUser, request: ProcessStepRequestPbo, context: ServicerContext) -> None:
@@ -673,11 +665,11 @@ class ToolBase(ABC):
         :return: The ToolDetailsPbo proto object representing this tool.
         """
         return ToolDetailsPbo(
-            name=self.name,
-            description=self.description,
+            name=self._name,
+            description=self._description,
             input_configs=self.inputs,
             output_configs=self.outputs,
-            output_data_type_name=self.data_type_name,
+            output_data_type_name=self._data_type_name,
             config_fields=self.configs
         )
 
@@ -771,7 +763,7 @@ class ToolBase(ABC):
         if not message:
             return
         if self.verbose_logging:
-            self.logs.append(f"INFO: {self.name}: {message}")
+            self.logs.append(f"INFO: {self._name}: {message}")
         self.logger.info(message)
 
     def log_warning(self, message: str) -> None:
@@ -783,7 +775,7 @@ class ToolBase(ABC):
         """
         if not message:
             return
-        self.logs.append(f"WARNING: {self.name}: {message}")
+        self.logs.append(f"WARNING: {self._name}: {message}")
         self.logger.warning(message)
 
     def log_error(self, message: str) -> None:
@@ -795,7 +787,7 @@ class ToolBase(ABC):
         """
         if not message:
             return
-        self.logs.append(f"ERROR: {self.name}: {message}")
+        self.logs.append(f"ERROR: {self._name}: {message}")
         self.logger.error(message)
 
     def log_exception(self, message: str, e: Exception) -> None:
@@ -808,7 +800,7 @@ class ToolBase(ABC):
         """
         if not message and not e:
             return
-        self.logs.append(f"EXCEPTION: {self.name}: {message} - {e}")
+        self.logs.append(f"EXCEPTION: {self._name}: {message} - {e}")
         self.logger.error(f"{message}\n{traceback.format_exc()}")
 
     def get_input_binary(self, index: int = 0) -> list[bytes]:

{sapiopycommons-2025.7.22a637.dist-info → sapiopycommons-2025.7.22a639.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.7.22a637
+Version: 2025.7.22a639
 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.22a637.dist-info → sapiopycommons-2025.7.22a639.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=C8yr4Zp4vflRxufD2oUD45PVmQnfra5hi6flKJ230Tg,11169
-sapiopycommons/ai/tool_service_base.py,sha256=r_QJHcN1z1umzet9av7N66Mk5tIVaWPfEHDQzveYzwc,41884
+sapiopycommons/ai/test_client.py,sha256=d5P01dUNRKpEgTENZQoIHUvPE0nEut5D9upT5txQWB8,11173
+sapiopycommons/ai/tool_service_base.py,sha256=OtiTiv-n6EpSFxZYwe_OjdUucU0Pu0EfQ6BYJmShZfE,41651
 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=tyaYGG1-v_JJrJHZ6cy5mGCxX9z1foLw7pM4MDJlFxs,14297
-sapiopycommons-2025.7.22a637.dist-info/METADATA,sha256=5XWnDlnBTpUOuqdFcZWfLf2Hcsvo3XBqsX0TbWvCAIY,3143
-sapiopycommons-2025.7.22a637.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sapiopycommons-2025.7.22a637.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2025.7.22a637.dist-info/RECORD,,
+sapiopycommons-2025.7.22a639.dist-info/METADATA,sha256=EhxAxl41sKcLAMYPPcoxCB4xgtbAZJZ1by3HAv_n5mE,3143
+sapiopycommons-2025.7.22a639.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+sapiopycommons-2025.7.22a639.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2025.7.22a639.dist-info/RECORD,,