clarifai 11.1.7rc2__py3-none-any.whl → 11.1.7rc3__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.7rc2"
+__version__ = "11.1.7rc3"

clarifai/client/model_client.py

@@ -135,6 +135,7 @@ class ModelClient:
       # set names, annotations and docstrings
       f.__name__ = method_name
       f.__qualname__ = f'{self.__class__.__name__}.{method_name}'
+      # TODO: set signature from annotations to the function, currently  MethodSignature don't have `annotations_json` field
       # input_annotations = json.loads(method_signature.annotations_json)
       # return_annotation = input_annotations.pop('return', None)
       # sig = inspect.signature(f).replace(

clarifai/runners/dockerfile_template/Dockerfile.template

@@ -44,9 +44,6 @@ ENV PYTHONPATH=${PYTHONPATH}:/home/nonroot/main \
     CLARIFAI_COMPUTE_CLUSTER_ID=${CLARIFAI_COMPUTE_CLUSTER_ID} \
     CLARIFAI_API_BASE=${CLARIFAI_API_BASE:-https://api.clarifai.com}
 
-# # Write out the model function signatures
-# RUN ["python", "-m", "clarifai.cli", "model", "signatures", "--model_path", "/home/nonroot/main", "--out_path", "/home/nonroot/main/signatures.yaml"]
-
 # Finally run the clarifai entrypoint to start the runner loop and local dev server.
 # Note(zeiler): we may want to make this a clarifai CLI call.
 ENTRYPOINT ["python", "-m", "clarifai.runners.server"]

clarifai/runners/models/model_builder.py

@@ -1,3 +1,4 @@
+import builtins
 import importlib
 import inspect
 import os
@@ -6,6 +7,7 @@ import sys
 import tarfile
 import time
 from string import Template
+from unittest.mock import MagicMock
 
 import yaml
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
@@ -80,7 +82,7 @@ class ModelBuilder:
 
   def load_model_class(self):
     """
-    Import the model class from the model.py file.
+    Import the model class from the model.py file, dynamically handling missing dependencies
     """
     # look for default model.py file location
     for loc in ["model.py", "1/model.py"]:
@@ -95,7 +97,29 @@ class ModelBuilder:
     spec = importlib.util.spec_from_file_location(module_name, model_file)
     module = importlib.util.module_from_spec(spec)
     sys.modules[module_name] = module
-    spec.loader.exec_module(module)
+
+    original_import = builtins.__import__
+
+    def custom_import(name, globals=None, locals=None, fromlist=(), level=0):
+
+      # Allow standard libraries and clarifai
+      if self._is_standard_or_clarifai(name):
+        return original_import(name, globals, locals, fromlist, level)
+
+      # Mock all third-party imports to avoid ImportErrors or other issues
+      return MagicMock()
+
+    # Replace the built-in __import__ function with our custom one
+    builtins.__import__ = custom_import
+
+    try:
+      spec.loader.exec_module(module)
+    except Exception as e:
+      logger.error(f"Error loading model.py: {e}")
+      raise
+    finally:
+      # Restore the original __import__ function
+      builtins.__import__ = original_import
 
     # Find all classes in the model.py file that are subclasses of ModelClass
     classes = [
@@ -122,6 +146,23 @@ class ModelBuilder:
     model_class = classes[0]
     return model_class
 
+  def _is_standard_or_clarifai(self, name):
+    """Check if import is from standard library or clarifai"""
+    if name.startswith("clarifai"):
+      return True
+
+    # Handle Python <3.10 compatibility
+    stdlib_names = getattr(sys, "stdlib_module_names", sys.builtin_module_names)
+    if name in stdlib_names:
+      return True
+
+    # Handle submodules (e.g., os.path)
+    parts = name.split(".")
+    for i in range(1, len(parts)):
+      if ".".join(parts[:i]) in stdlib_names:
+        return True
+    return False
+
   def _validate_folder(self, folder):
     if folder == ".":
       folder = ""  # will getcwd() next which ends with /
@@ -557,13 +598,12 @@ class ModelBuilder:
     logger.info(f"Updated config.yaml with {len(concepts)} concepts.")
 
   def get_model_version_proto(self):
-
+    signatures = self.get_method_signatures()
     model_version_proto = resources_pb2.ModelVersion(
         pretrained_model_config=resources_pb2.PretrainedModelConfig(),
         inference_compute_info=self.inference_compute_info,
+        method_signatures=signatures,
     )
-    # TODO: update this to `model_signatures` field when it's available in the API
-    model_version_proto.model_signature.extend(self.get_method_signatures())
 
     model_type_id = self.config.get('model').get('model_type_id')
     if model_type_id in CONCEPTS_REQUIRED_MODEL_TYPE:
@@ -750,6 +790,7 @@ class ModelBuilder:
               model_id=self.model_proto.id,
               version_id=self.model_version_id,
           ))
+
       status_code = resp.model_version.status.code
       logs = self.get_model_build_logs()
       for log_entry in logs.log_entries:

clarifai/runners/models/model_class.py

@@ -8,6 +8,7 @@ from typing import Any, Dict, Iterator, List
 
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
 from clarifai_grpc.grpc.api.status import status_code_pb2, status_pb2
+from google.protobuf import json_format
 
 from clarifai.runners.utils import data_types
 from clarifai.runners.utils.method_signatures import (build_function_signature, deserialize,
@@ -84,6 +85,7 @@ class ModelClass(ABC):
     try:
       # TODO add method name field to proto
       method_name = 'predict'
+      inference_params = get_inference_params(request)
       if len(request.inputs) > 0 and '_method_name' in request.inputs[0].data.metadata:
         method_name = request.inputs[0].data.metadata['_method_name']
       if method_name == '_GET_SIGNATURES':  # special case to fetch signatures, TODO add endpoint for this
@@ -94,8 +96,8 @@ class ModelClass(ABC):
       method_info = method._cf_method_info
       signature = method_info.signature
       python_param_types = method_info.python_param_types
-      inputs = self._convert_input_protos_to_python(request.inputs, signature.input_fields,
-                                                    python_param_types)
+      inputs = self._convert_input_protos_to_python(request.inputs, inference_params,
+                                                    signature.input_fields, python_param_types)
       if len(inputs) == 1:
         inputs = inputs[0]
         output = method(**inputs)
@@ -121,6 +123,7 @@ class ModelClass(ABC):
                       ) -> Iterator[service_pb2.MultiOutputResponse]:
     try:
       method_name = 'generate'
+      inference_params = get_inference_params(request)
       if len(request.inputs) > 0 and '_method_name' in request.inputs[0].data.metadata:
         method_name = request.inputs[0].data.metadata['_method_name']
       method = getattr(self, method_name)
@@ -128,8 +131,8 @@ class ModelClass(ABC):
       signature = method_info.signature
       python_param_types = method_info.python_param_types
 
-      inputs = self._convert_input_protos_to_python(request.inputs, signature.input_fields,
-                                                    python_param_types)
+      inputs = self._convert_input_protos_to_python(request.inputs, inference_params,
+                                                    signature.input_fields, python_param_types)
       if len(inputs) == 1:
         inputs = inputs[0]
         for output in method(**inputs):
@@ -161,6 +164,7 @@ class ModelClass(ABC):
       assert len(request.inputs) == 1, "Streaming requires exactly one input"
 
       method_name = 'generate'
+      inference_params = get_inference_params(request)
       if len(request.inputs) > 0 and '_method_name' in request.inputs[0].data.metadata:
         method_name = request.inputs[0].data.metadata['_method_name']
       method = getattr(self, method_name)
@@ -175,8 +179,8 @@ class ModelClass(ABC):
       stream_argname = stream_sig.name
 
       # convert all inputs for the first request, including the first stream value
-      inputs = self._convert_input_protos_to_python(request.inputs, signature.input_fields,
-                                                    python_param_types)
+      inputs = self._convert_input_protos_to_python(request.inputs, inference_params,
+                                                    signature.input_fields, python_param_types)
       kwargs = inputs[0]
 
       # first streaming item
@@ -187,8 +191,8 @@ class ModelClass(ABC):
         yield first_item
         # subsequent streaming items contain only the streaming input
         for request in request_iterator:
-          item = self._convert_input_protos_to_python(request.inputs, [stream_sig],
-                                                      python_param_types)
+          item = self._convert_input_protos_to_python(request.inputs, inference_params,
+                                                      [stream_sig], python_param_types)
           item = item[0][stream_argname]
           yield item
 
@@ -210,11 +214,12 @@ class ModelClass(ABC):
           stack_trace=traceback.format_exc().split('\n')))
 
   def _convert_input_protos_to_python(self, inputs: List[resources_pb2.Input],
+                                      inference_params: dict,
                                       variables_signature: List[resources_pb2.ModelTypeField],
                                       python_param_types) -> List[Dict[str, Any]]:
     result = []
     for input in inputs:
-      kwargs = deserialize(input.data, variables_signature)
+      kwargs = deserialize(input.data, variables_signature, inference_params)
       # dynamic cast to annotated types
       for k, v in kwargs.items():
         if k not in python_param_types:
@@ -262,6 +267,18 @@ class ModelClass(ABC):
     return method_info
 
 
+# Helper function to get the inference params
+def get_inference_params(request) -> dict:
+  """Get the inference params from the request."""
+  inference_params = {}
+  if request.model.model_version.id != "":
+    output_info = request.model.model_version.output_info
+    output_info = json_format.MessageToDict(output_info, preserving_proto_field_name=True)
+    if "params" in output_info:
+      inference_params = output_info["params"]
+  return inference_params
+
+
 class _MethodInfo:
 
   def __init__(self, method):

clarifai/runners/utils/method_signatures.py

@@ -260,7 +260,7 @@ def serialize(kwargs, signatures, proto=None, is_output=False):
   return proto
 
 
-def deserialize(proto, signatures, is_output=False):
+def deserialize(proto, signatures, inference_params={}, is_output=False):
   '''
   Deserialize the given proto into kwargs using the given signatures.
   '''
@@ -271,7 +271,12 @@ def deserialize(proto, signatures, is_output=False):
   for sig_i, sig in enumerate(signatures):
     serializer = serializer_from_signature(sig)
     part = parts_by_name.get(sig.name)
-    if part is None:
+    inference_params_value = inference_params.get(sig.name)
+    if part is not None:
+      kwargs[sig.name] = serializer.deserialize(part.data)
+    elif inference_params_value is not None:
+      kwargs[sig.name] = inference_params_value
+    else:
       if sig_i == 0:
         # possible inlined first value
         value = serializer.deserialize(proto)
@@ -280,10 +285,10 @@ def deserialize(proto, signatures, is_output=False):
           # an actual zero value passed in must be set in an explicit part
           kwargs[sig.name] = value
         continue
+
       if sig.required or is_output:  # TODO allow optional outputs?
         raise ValueError(f'Missing required field: {sig.name}')
       continue
-    kwargs[sig.name] = serializer.deserialize(part.data)
   if len(kwargs) == 1 and 'return' in kwargs:
     return kwargs['return']
   return kwargs

{clarifai-11.1.7rc2.dist-info → clarifai-11.1.7rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 11.1.7rc2
+Version: 11.1.7rc3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,8 +20,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.1.3
-Requires-Dist: clarifai-protocol>=0.0.16
+Requires-Dist: clarifai-grpc>=11.2.4
+Requires-Dist: clarifai-protocol>=0.0.20
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: rich>=13.4.2

{clarifai-11.1.7rc2.dist-info → clarifai-11.1.7rc3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=wdUgSsqM2z4GI0P61jMvu6qis3DRIZLxpNZx-WIA-A4,26
+clarifai/__init__.py,sha256=l0wL8EO4WdUNsKcblugjv356bjDqdfj1fg33DYBM7Uo,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -31,7 +31,7 @@ clarifai/client/deployment.py,sha256=w7Y6pA1rYG4KRK1SwusRZc2sQRXlG8wezuVdzSWpCo0
 clarifai/client/input.py,sha256=obMAHMDU1OwfXZ8KraOnGFlWzlW-3F7Ob_2lcOQMlhY,46339
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
 clarifai/client/model.py,sha256=DFlZLIExMUvYXc9hDzVLYka6_AbfG3vqLlhZkk4GfIY,76835
-clarifai/client/model_client.py,sha256=JCHawIxxJvPMAD3W-gmVKz6_XQDP1shoxFYaZCEN1X8,16943
+clarifai/client/model_client.py,sha256=aeKx8mx5gXqkRnipHLDYRPLIy28c0iO2MWCn3dRK9eE,17068
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -135,11 +135,11 @@ clarifai/runners/__pycache__/__init__.cpython-39.pyc,sha256=-nXCOCynrtendkWHFkfy
 clarifai/runners/dockerfile_template/Dockerfile.cpu.template,sha256=WD9B_gpTZ8mzWPQXtWWr5Bp_TEhVJzbznKVIjyPK8yk,1136
 clarifai/runners/dockerfile_template/Dockerfile.cuda.template,sha256=LAn7H1zi_lyk5iQdGdNifQrwrTifAZe9FHgxPCYg8D0,1464
 clarifai/runners/dockerfile_template/Dockerfile.nim,sha256=CSdUAehj3uOwminioLnT5v3hIXzkkv3sgx9RT4k5Lks,2806
-clarifai/runners/dockerfile_template/Dockerfile.template,sha256=NRybJOAOCtnIec-CyxQDG-vqdSLrPV_MEFFHmEv_9tc,2509
+clarifai/runners/dockerfile_template/Dockerfile.template,sha256=5cjv7U8PmWa3DB_5B1CqSYh_6GE0E0np52TIAa7EIDE,2312
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/base_typed_model.py,sha256=0QCWxch8CcyJSKvE1D4PILd2RSnQZHTmx4DXlQQ6dpo,7856
-clarifai/runners/models/model_builder.py,sha256=cMS6P8II9FCtGmlz9A89NmogdDdjmjYbQf5JbJn_tFw,33538
-clarifai/runners/models/model_class.py,sha256=llFJhIhA8unzvROryma2_dmzoZNduN7Ki5AOLzGdCLA,11034
+clarifai/runners/models/model_builder.py,sha256=p4xl3Hvol7J25Z8E--CWvrPQr1SxWuchvwZC3Dx18l0,34777
+clarifai/runners/models/model_class.py,sha256=qK5qk4geoFpqrRtl4VmKK90CIJKyWmD_vjJMqLWR_CQ,11854
 clarifai/runners/models/model_class_refract.py,sha256=HxuozxSW7ag5yWCPxjNwgLArQ6dORhyGXlnpPaZz2-c,3211
 clarifai/runners/models/model_run_locally.py,sha256=VZetm9Mko8MBjcjwr6PCnTU9gF3glgD5qvpbj-8tW2s,17962
 clarifai/runners/models/model_runner.py,sha256=qyc73pe4xc9BsUKHwnOyC9g-RNCARiFis4GTh-yg0vg,6219
@@ -163,7 +163,7 @@ clarifai/runners/utils/data_types.py,sha256=nJS9n4oQHcwf2scxH8pl5TjHcY9l6ZdY401f
 clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
 clarifai/runners/utils/loader.py,sha256=SgNHMwRmCCymFQm8aDp73NmIUHhM-N60CBlTKbPzmVc,7470
 clarifai/runners/utils/logger.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/utils/method_signatures.py,sha256=nVrxqD9rHxUzFYK-RSmX-D6uhw0nP_pVkFfIQ9IMEaM,17224
+clarifai/runners/utils/method_signatures.py,sha256=EnVdLsyh7GzE7pY7fWqtcDN6t6gYKnGLU_yJnHxw7vI,17415
 clarifai/runners/utils/serializers.py,sha256=S4sRsOVvH191vAGTRTAAdwLlQwlK4T5QVRDGPptg9nQ,7191
 clarifai/runners/utils/url_fetcher.py,sha256=v_8JOWmkyFAzsBulsieKX7Nfjy1Yg7wGSZeqfEvw2cg,1640
 clarifai/runners/utils/__pycache__/__init__.cpython-310.pyc,sha256=0GGbXIecXlOZmQKMCkSRhEBY_a1zvoimv-mHG4pJuNA,167
@@ -229,9 +229,9 @@ clarifai/workflows/__pycache__/__init__.cpython-39.pyc,sha256=9nA--jULSW7OFrYOcs
 clarifai/workflows/__pycache__/export.cpython-310.pyc,sha256=phEGwi2gAojCUhRTqjZVeTDn7Gk6LCVBeSTjAj4m9iY,2418
 clarifai/workflows/__pycache__/utils.cpython-310.pyc,sha256=M9_KTM7GOOS5SPrWwAzqHDqyGvgKi3xuSGvyw6MNf-I,1925
 clarifai/workflows/__pycache__/validate.cpython-310.pyc,sha256=c18Jgp_-CAm8RD_tmUpDCPoqZeexaoWELG0yBzb9rjw,2149
-clarifai-11.1.7rc2.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.1.7rc2.dist-info/METADATA,sha256=OnchJXRxSSzZ62JYttF3CYL9AS5IVJ-sxoD-5JBLYnw,22214
-clarifai-11.1.7rc2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-clarifai-11.1.7rc2.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.1.7rc2.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.1.7rc2.dist-info/RECORD,,
+clarifai-11.1.7rc3.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.7rc3.dist-info/METADATA,sha256=-t2evkzC5WdrGOlmiBDkINx4r8Pnpg-q7ZEvqz6RgMk,22214
+clarifai-11.1.7rc3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+clarifai-11.1.7rc3.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.7rc3.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.7rc3.dist-info/RECORD,,