sapiopycommons 2025.9.10a743__tar.gz → 2025.9.10a745__tar.gz

{sapiopycommons-2025.9.10a743 → sapiopycommons-2025.9.10a745}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.9.10a743
+Version: 2025.9.10a745
 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.9.10a743 → sapiopycommons-2025.9.10a745}/pyproject.toml

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

{sapiopycommons-2025.9.10a743 → sapiopycommons-2025.9.10a745}/src/sapiopycommons/ai/tool_service_base.py

@@ -5,14 +5,16 @@ import io
 import json
 import logging
 import re
+import subprocess
 import traceback
 from abc import abstractmethod, ABC
 from logging import Logger
+from subprocess import CompletedProcess
 from typing import Any, Iterable, Mapping
 
 from grpc import ServicerContext
 from sapiopylib.rest.User import SapioUser, ensure_logger_initialized
-from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition, FieldValidator
+from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition
 
 from sapiopycommons.ai.protoapi.fielddefinitions.fields_pb2 import FieldValueMapPbo, FieldValuePbo
 from sapiopycommons.ai.protoapi.fielddefinitions.velox_field_def_pb2 import VeloxFieldDefPbo, FieldTypePbo, \
@@ -663,7 +665,7 @@ class ToolBase(ABC):
             string_properties=StringPropertiesPbo(
                 default_value=default_value,
                 max_length=max_length,
-                field_validator=FieldValidatorPbo(validation_regex, error_msg) if validation_regex else None
+                field_validator=FieldValidatorPbo(validation_regex=validation_regex, error_message=error_msg) if validation_regex else None
             )
         ))
 
@@ -697,7 +699,7 @@ class ToolBase(ABC):
                 default_value=default_value,
                 static_list_values=allowed_values,
                 direct_edit=direct_edit,
-                field_validator=FieldValidatorPbo(validation_regex, error_msg) if validation_regex else None
+                field_validator=FieldValidatorPbo(validation_regex=validation_regex, error_message=error_msg) if validation_regex else None
             )
         ))
 
@@ -732,7 +734,7 @@ class ToolBase(ABC):
                 static_list_values=allowed_values,
                 multi_select=True,
                 direct_edit=direct_edit,
-                field_validator=FieldValidatorPbo(validation_regex, error_msg) if validation_regex else None
+                field_validator=FieldValidatorPbo(validation_regex=validation_regex, error_message=error_msg) if validation_regex else None
             )
         ))
 
@@ -828,6 +830,26 @@ class ToolBase(ABC):
         """
         pass
 
+    def call_subprocess(self, args: list[str], cwd: str | None = None, **kwargs) -> CompletedProcess[str]:
+        """
+        Call a subprocess with the given arguments, logging the command and any errors that occur.
+        This function will raise an exception if the return code of the subprocess is non-zero. The output of the
+        subprocess will be captured and returned as part of the CompletedProcess object.
+
+        :param args: The list of arguments to pass to the subprocess.
+        :param cwd: The working directory to run the subprocess in. If None, the current working directory is used.
+        :param kwargs: Additional keyword arguments to pass to subprocess.run().
+        :return: The CompletedProcess object returned by subprocess.run().
+        """
+        try:
+            self.log_info(f"Running subprocess with command: {' '.join(args)}")
+            return subprocess.run(args, check=True, capture_output=True, text=True, cwd=cwd, **kwargs)
+        except subprocess.CalledProcessError as e:
+            self.log_error(f"Error running subprocess. Return code: {e.returncode}")
+            self.log_error(f"STDOUT: {e.stdout}")
+            self.log_error(f"STDERR: {e.stderr}")
+            raise
+
     def log_info(self, message: str) -> None:
         """
         Log an info message for this tool. If verbose logging is enabled, this message will be included in the logs