clarifai 11.1.5rc2__tar.gz → 11.1.5rc4__tar.gz

{clarifai-11.1.5rc2/clarifai.egg-info → clarifai-11.1.5rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 11.1.5rc2
+Version: 11.1.5rc4
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-11.1.5rc4/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "11.1.5rc4"

{clarifai-11.1.5rc2 → clarifai-11.1.5rc4}/clarifai/client/model.py

@@ -443,6 +443,15 @@ class Model(Lister, BaseClient):
         output_config=output_config,
     )
 
+  def predict2(self, inputs):
+    """Predicts the model based on the given inputs.
+
+    Args:
+        inputs (list[Input]): The inputs to predict, must be less than 128.
+    """
+
+    return self.model_client._predict(inputs=inputs,)
+
   def _check_predict_input_type(self, input_type: str) -> None:
     """Checks if the input type is valid for the model.
 

{clarifai-11.1.5rc2 → clarifai-11.1.5rc4}/clarifai/client/model_client.py

@@ -48,8 +48,10 @@ class ModelClient:
 
     request = service_pb2.PostModelOutputsRequest()
     request.CopyFrom(self.request_template)
-    request.model.model_version.output_info.params['_method_name'] = '_GET_SIGNATURES'
-    request.inputs.add()  # empty input for this method
+    # request.model.model_version.output_info.params['_method_name'] = '_GET_SIGNATURES'
+    inp = request.inputs.add()  # empty input for this method
+    inp.data.parts.add()  # empty part for this input
+    inp.data.metadata['method_name'] = '_GET_SIGNATURES'
     start_time = time.time()
     backoff_iterator = BackoffIterator(10)
     while True:
@@ -65,8 +67,10 @@ class ModelClient:
       self._method_signatures = {}
       return
     if response.status.code != status_code_pb2.SUCCESS:
-      raise Exception(f"Model failed with response {response.status!r}")
+      raise Exception(f"Model failed with response {response!r}")
     self._method_signatures = signatures_from_json(response.outputs[0].data.string_value)
+    import pdb
+    pdb.set_trace()
 
   def _define_functions(self):
     '''

{clarifai-11.1.5rc2 → clarifai-11.1.5rc4}/clarifai/runners/dockerfile_template/Dockerfile.template

@@ -44,8 +44,8 @@ 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"]
+# # 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.

{clarifai-11.1.5rc2 → clarifai-11.1.5rc4}/clarifai/runners/models/model_class.py

@@ -70,13 +70,14 @@ class ModelClass(ABC):
 
   def load_model(self):
     """Load the model."""
-    pass
 
   def _handle_get_signatures_request(self) -> service_pb2.MultiOutputResponse:
     methods = self._get_method_info()
     signatures = {method.name: method.signature for method in methods.values()}
     resp = service_pb2.MultiOutputResponse(status=status_pb2.Status(code=status_code_pb2.SUCCESS))
-    resp.outputs.add().data.string_value = signatures_to_json(signatures)
+    output = resp.outputs.add()
+    output.status.code = status_code_pb2.SUCCESS
+    output.data.string_value = signatures_to_json(signatures)
     return resp
 
   def batch_predict(self, method, inputs: List[Dict[str, Any]]) -> List[Any]:
@@ -98,8 +99,9 @@ class ModelClass(ABC):
     outputs = []
     try:
       # TODO add method name field to proto
-      call_params = dict(request.model.model_version.output_info.params)
-      method_name = call_params.get('_method_name', 'predict')
+      method_name = request.inputs[0].data.metadata['method_name']
+      # call_params = dict(request.model.model_version.output_info.params)
+      # method_name = call_params.get('_method_name', 'predict')
       if method_name == '_GET_SIGNATURES':  # special case to fetch signatures, TODO add endpoint for this
         return self._handle_get_signatures_request()
       if method_name not in self._get_method_info():

{clarifai-11.1.5rc2 → clarifai-11.1.5rc4/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 11.1.5rc2
+Version: 11.1.5rc4
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-11.1.5rc2/clarifai/__init__.py

@@ -1 +0,0 @@
-__version__ = "11.1.5rc2"