clarifai 11.1.5rc5__tar.gz → 11.1.5rc6__tar.gz

{clarifai-11.1.5rc5/clarifai.egg-info → clarifai-11.1.5rc6}/PKG-INFO

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

clarifai-11.1.5rc6/clarifai/__init__.py

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

{clarifai-11.1.5rc5 → clarifai-11.1.5rc6}/clarifai/client/model_client.py

@@ -51,11 +51,9 @@ class ModelClient:
     # 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'
+    inp.data.metadata['_method_name'] = '_GET_SIGNATURES'
     start_time = time.time()
     backoff_iterator = BackoffIterator(10)
-    import pdb
-    pdb.set_trace()
     while True:
       response = self.STUB.PostModelOutputs(request)
       if status_is_retryable(
@@ -71,6 +69,8 @@ class ModelClient:
     if response.status.code != status_code_pb2.SUCCESS:
       raise Exception(f"Model failed with response {response!r}")
     self._method_signatures = signatures_from_json(response.outputs[0].data.text.raw)
+    import pdb
+    pdb.set_trace()
 
   def _define_functions(self):
     '''
@@ -214,8 +214,10 @@ class ModelClient:
     request.inputs.extend(inputs)
 
     if method_name:
+      for inp in inputs:
+        inp.data.metadata['_method_name'] = method_name
       # TODO put in new proto field?
-      request.model.model_version.output_info.params['_method_name'] = method_name
+      # request.model.model_version.output_info.params['_method_name'] = method_name
     if inference_params:
       request.model.model_version.output_info.params.update(inference_params)
     if output_config:
@@ -228,12 +230,12 @@ class ModelClient:
       response = self.STUB.PostModelOutputs(request)
       if status_is_retryable(
           response.status.code) and time.time() - start_time < 60 * 10:  # 10 minutes
-        self.logger.info(f"Model predict failed with response {response.status!r}")
+        self.logger.info(f"Model predict failed with response {response!r}")
         time.sleep(next(backoff_iterator))
         continue
 
       if response.status.code != status_code_pb2.SUCCESS:
-        raise Exception(f"Model predict failed with response {response.status!r}")
+        raise Exception(f"Model predict failed with response {response!r}")
       break
 
     return response
@@ -296,7 +298,9 @@ class ModelClient:
 
     if method_name:
       # TODO put in new proto field?
-      request.model.model_version.output_info.params['_method_name'] = method_name
+      for inp in inputs:
+        inp.data.metadata['_method_name'] = method_name
+      # request.model.model_version.output_info.params['_method_name'] = method_name
     if inference_params:
       request.model.model_version.output_info.params.update(inference_params)
     if output_config:
@@ -379,7 +383,7 @@ class ModelClient:
                     output_config: Dict = {}):
     request = service_pb2.PostModelOutputsRequest()
     request.CopyFrom(self.request_template)
-    request.model.model_version.output_info.params['_method_name'] = method_name
+    # request.model.model_version.output_info.params['_method_name'] = method_name
     if inference_params:
       request.model.model_version.output_info.params.update(inference_params)
     if output_config:
@@ -391,6 +395,8 @@ class ModelClient:
         req.inputs.extend(inputs)
       else:
         req.inputs.append(inputs)
+      for inp in req.inputs:
+        inp.data.metadata['_method_name'] = method_name
       yield req
 
   def _stream_by_proto(self,

{clarifai-11.1.5rc5 → clarifai-11.1.5rc6}/clarifai/runners/models/model_class.py

@@ -99,7 +99,9 @@ class ModelClass(ABC):
     outputs = []
     try:
       # TODO add method name field to proto
-      method_name = request.inputs[0].data.metadata['method_name']
+      method_name = None
+      if len(request.inputs) > 0:
+        method_name = request.inputs[0].data.metadata.get('_method_name', None)
       # 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

{clarifai-11.1.5rc5 → clarifai-11.1.5rc6/clarifai.egg-info}/PKG-INFO

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

clarifai-11.1.5rc5/clarifai/__init__.py

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