clarifai 11.1.5rc5__py3-none-any.whl → 11.1.5rc7__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.5rc5"
+__version__ = "11.1.5rc7"

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/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 and '_method_name' in request.inputs[0].data.metadata:
+        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

{clarifai-11.1.5rc5.dist-info → clarifai-11.1.5rc7.dist-info}/METADATA

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

{clarifai-11.1.5rc5.dist-info → clarifai-11.1.5rc7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=EVdSPaKg-d4UlTX2fBLmJyUiByqmV2irRQbr1CIlTyI,26
+clarifai/__init__.py,sha256=tywwbtw-s_-_zaSWpFydRfgNN3Cl1l3gmoGNpj_PQvg,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -30,7 +30,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=Z4cz-qXznbttETnH3W_LyyscGawvtBkRfaSCsdOgAvs,75334
-clarifai/client/model_client.py,sha256=cI9jo1tldfTISfmyA5fVb9_XLbZ94GLfUH8VRxnLS7w,16649
+clarifai/client/model_client.py,sha256=OR4n1yv9wr8MBEzR14rC-2XeFoP84SGOUlSRDo1KbH0,16889
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -135,14 +135,14 @@ clarifai/runners/dockerfile_template/Dockerfile.debug~,sha256=7YOVg3adIaiudfSkfL
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=MWGjj0My6d18v-nyhWuNbSXUzCzR6KWkohRB1yInb7Q,2525
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/model_builder.py,sha256=UCAeJiP_fRFfIuVI1sOge7LMwe-psgvdBuZ0LsJQMpM,33062
-clarifai/runners/models/model_class.py,sha256=SyGZWUeFHcEXR99jQMi8KHgbz2Do0FQrIIkrPGpVyQI,11187
+clarifai/runners/models/model_class.py,sha256=C8nncnIkw7lHY7PTrY0hq2Kd9AI17bV2KJ9_8uVzzvE,11303
 clarifai/runners/models/model_run_locally.py,sha256=VZetm9Mko8MBjcjwr6PCnTU9gF3glgD5qvpbj-8tW2s,17962
 clarifai/runners/models/model_runner.py,sha256=qyc73pe4xc9BsUKHwnOyC9g-RNCARiFis4GTh-yg0vg,6219
 clarifai/runners/models/model_servicer.py,sha256=A--b1P71PBCAMJCpy_-fpNDkfCVdvdMh1LleW15dSas,3037
 clarifai/runners/models/__pycache__/__init__.cpython-310.pyc,sha256=GTFjzypyx5wnDGqxYeY01iya1CELKb5fOFBFLV031yU,171
 clarifai/runners/models/__pycache__/base_typed_model.cpython-310.pyc,sha256=rr_Pxrq9MaT1keVVxBHF59pKv8-dX53B2uLscDXfbfY,8271
 clarifai/runners/models/__pycache__/model_builder.cpython-310.pyc,sha256=0C76O8ZOXrT3y6CVs53h_9cg7XkZKbSxyd6zp0UoAug,27487
-clarifai/runners/models/__pycache__/model_class.cpython-310.pyc,sha256=XzSQJr2iRVgLea51EEdEW-ehzmLk-7CriEsyUDDNIFA,9494
+clarifai/runners/models/__pycache__/model_class.cpython-310.pyc,sha256=X5YKyOp_3_XUczns0au1R87V-urx9HzauulAtrIRCqM,9524
 clarifai/runners/models/__pycache__/model_run_locally.cpython-310.pyc,sha256=maLshBrvhTy0C6grT26JPAA14P-nD9WDWN25E2BErsE,16976
 clarifai/runners/models/__pycache__/model_runner.cpython-310.pyc,sha256=u4ZYB_TJJgvqkQ-7_yPUoKU0tT2ycwzBXuqfORwUF3Y,4999
 clarifai/runners/models/__pycache__/model_servicer.cpython-310.pyc,sha256=9QTYk4zVHBUtlTfkH3WaE6frNdN6ba57EVj4bKe18YA,2501
@@ -195,9 +195,9 @@ clarifai/workflows/__pycache__/__init__.cpython-310.pyc,sha256=oRKg6B7Z-wWQy0EW2
 clarifai/workflows/__pycache__/export.cpython-310.pyc,sha256=cNmGLnww7xVpm4htd1vRhQJoEZ1dhpN1oD8iLLAtVzM,2418
 clarifai/workflows/__pycache__/utils.cpython-310.pyc,sha256=rm2kWk4a3GOKWoerXpEAEeRvGhEe7wPd0ZZ6jHtEGqY,1925
 clarifai/workflows/__pycache__/validate.cpython-310.pyc,sha256=QA1i6YdDpY824cqtQvkEaFPpaCa2iqfOwFouqwZfAKY,2139
-clarifai-11.1.5rc5.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.1.5rc5.dist-info/METADATA,sha256=1IhV9kk6rj0tpNSlGl9pAMmTl58-psQxnn2Mlx4th7A,22229
-clarifai-11.1.5rc5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-clarifai-11.1.5rc5.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.1.5rc5.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.1.5rc5.dist-info/RECORD,,
+clarifai-11.1.5rc7.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.5rc7.dist-info/METADATA,sha256=BUQnMv-en_TmdnFCw5l8HpZUJoVC_xfcwotJt4VXhw8,22229
+clarifai-11.1.5rc7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+clarifai-11.1.5rc7.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.5rc7.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.5rc7.dist-info/RECORD,,