clarifai 10.8.7__py3-none-any.whl → 10.8.8__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "10.8.7"
+__version__ = "10.8.8"

clarifai/runners/models/model_servicer.py

@@ -13,6 +13,11 @@ class ModelServicer(service_pb2_grpc.V2Servicer):
   """
 
   def __init__(self, model_class):
+    """
+    Args:
+        model_class: The class that will handle the model logic. Must implement predict(),
+    generate(), stream().
+    """
     self.model_class = model_class
 
   def PostModelOutputs(self, request: service_pb2.PostModelOutputsRequest,

clarifai/runners/models/model_upload.py

@@ -255,7 +255,7 @@ class ModelUploader:
           flush=True)
     print()
     if response.status.code != status_code_pb2.MODEL_BUILDING:
-      logger.error(f"Failed to upload model version: {response.status.description}")
+      logger.error(f"Failed to upload model version: {response}")
       return
     model_version_id = response.model_version_id
     logger.info(f"Created Model Version ID: {model_version_id}")
@@ -269,9 +269,9 @@ class ModelUploader:
       chunk_size = int(127 * 1024 * 1024)  # 127MB chunk size
       num_chunks = (file_size // chunk_size) + 1
       logger.info("Uploading file...")
-      logger.info("File size: ", file_size)
-      logger.info("Chunk size: ", chunk_size)
-      logger.info("Number of chunks: ", num_chunks)
+      logger.info(f"File size: {file_size}")
+      logger.info(f"Chunk size: {chunk_size}")
+      logger.info(f"Number of chunks: {num_chunks}")
       read_so_far = 0
       for part_id in range(num_chunks):
         try:
@@ -317,8 +317,7 @@ class ModelUploader:
           ))
       status_code = resp.model_version.status.code
       if status_code == status_code_pb2.MODEL_BUILDING:
-        logger.info(
-            f"Model is building... (elapsed {time.time() - st:.1f}s)", end='\r', flush=True)
+        print(f"Model is building... (elapsed {time.time() - st:.1f}s)", end='\r', flush=True)
         time.sleep(1)
       elif status_code == status_code_pb2.MODEL_TRAINED:
         logger.info("\nModel build complete!")

clarifai/runners/server.py

@@ -15,6 +15,7 @@ from clarifai_protocol import BaseRunner
 from clarifai_protocol.utils.grpc_server import GRPCServer
 
 from clarifai.runners.models.model_servicer import ModelServicer
+from clarifai.runners.models.model_upload import ModelUploader
 from clarifai.utils.logging import logger
 
 
@@ -93,21 +94,26 @@ def main():
 
   MyRunner = classes[0]
 
-  # initialize the Runner class. This is what the user implements.
-  # (Note) do we want to set runner_id, nodepool_id, compute_cluster_id, base_url, num_parallel_polls as env vars? or as args?
-  runner = MyRunner(
-      runner_id=os.environ["CLARIFAI_RUNNER_ID"],
-      nodepool_id=os.environ["CLARIFAI_NODEPOOL_ID"],
-      compute_cluster_id=os.environ["CLARIFAI_COMPUTE_CLUSTER_ID"],
-      base_url=os.environ["CLARIFAI_API_BASE"],
-      num_parallel_polls=int(os.environ.get("CLARIFAI_NUM_THREADS", 1)),
-  )
-
-  # initialize the servicer
-  servicer = ModelServicer(runner)
-
   # Setup the grpc server for local development.
   if parsed_args.start_dev_server:
+
+    # We validate that we have checkpoints downloaded before constructing MyRunner which
+    # will call load_model()
+    uploader = ModelUploader(parsed_args.model_path)
+    uploader.download_checkpoints()
+
+    # initialize the Runner class. This is what the user implements.
+    # we aren't going to call runner.start() to engage with the API so IDs are not necessary.
+    runner = MyRunner(
+        runner_id="n/a",
+        nodepool_id="n/a",
+        compute_cluster_id="n/a",
+        health_check_port=None,  # not needed when running local server
+    )
+
+    # initialize the servicer with the runner so that it gets the predict(), generate(), stream() classes.
+    servicer = ModelServicer(runner)
+
     server = GRPCServer(
         futures.ThreadPoolExecutor(
             max_workers=parsed_args.pool_size,
@@ -121,9 +127,18 @@ def main():
     service_pb2_grpc.add_V2Servicer_to_server(servicer, server)
     server.start()
     logger.info("Started server on port %s", parsed_args.port)
-    # server.wait_for_termination() # won't get here currently.
-
-  runner.start()  # start the runner loop to fetch work from the API.
+    server.wait_for_termination()
+  else:  # start the runner with the proper env variables and as a runner protocol.
+
+    # initialize the Runner class. This is what the user implements.
+    runner = MyRunner(
+        runner_id=os.environ["CLARIFAI_RUNNER_ID"],
+        nodepool_id=os.environ["CLARIFAI_NODEPOOL_ID"],
+        compute_cluster_id=os.environ["CLARIFAI_COMPUTE_CLUSTER_ID"],
+        base_url=os.environ["CLARIFAI_API_BASE"],
+        num_parallel_polls=int(os.environ.get("CLARIFAI_NUM_THREADS", 1)),
+    )
+    runner.start()  # start the runner to fetch work from the API.
 
 
 if __name__ == '__main__':

{clarifai-10.8.7.dist-info → clarifai-10.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.8.7
+Version: 10.8.8
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -21,7 +21,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: clarifai-grpc >=10.8.7
-Requires-Dist: clarifai-protocol >=0.0.4
+Requires-Dist: clarifai-protocol >=0.0.6
 Requires-Dist: numpy >=1.22.0
 Requires-Dist: tqdm >=4.65.0
 Requires-Dist: tritonclient >=2.34.0

{clarifai-10.8.7.dist-info → clarifai-10.8.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=rJghd8fTbSCfCAow2Dmd1bS2hdZ2VQdNcu2IHtIH5vU,23
+clarifai/__init__.py,sha256=R5TlZkVSY_3KONgwTjYGkLjWDowTwpSZI-Sd8aiRjAU,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -54,15 +54,15 @@ clarifai/rag/__init__.py,sha256=wu3PzAzo7uqgrEzuaC9lY_3gj1HFiR3GU3elZIKTT5g,40
 clarifai/rag/rag.py,sha256=L10TcV9E0PF1aJ2Nn1z1x6WVoUoGxbKt20lQXg8ksqo,12594
 clarifai/rag/utils.py,sha256=yr1jAcbpws4vFGBqlAwPPE7v1DRba48g8gixLFw8OhQ,4070
 clarifai/runners/__init__.py,sha256=3vr4RVvN1IRy2SxJpyycAAvrUBbH-mXR7pqUmu4w36A,412
-clarifai/runners/server.py,sha256=M6TaNy5gWgAJG29ZkUgzGThVNnWpWJerIiFINk2X-j4,4259
+clarifai/runners/server.py,sha256=CVLrv2DjzCvKVXcJ4SWvcFWUZq0bdlBmyEpfVlfgT2A,4902
 clarifai/runners/dockerfile_template/Dockerfile.cpu.template,sha256=lJw28GwMHEGO1uaDmEk2xb-Xx4y5pr_YY2Ipg25SLqo,1213
 clarifai/runners/dockerfile_template/Dockerfile.cuda.template,sha256=lwDwfeb9vtW3zVLBtlJYo44j02Am7FH2FABthwY47kY,4971
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/base_typed_model.py,sha256=OnAk08Lo2Y1fGiBc6JJ6UvJ8P435cTsikTNYDkStDpI,7790
 clarifai/runners/models/model_class.py,sha256=9JSPAr4U4K7xI0kSl-q0mHB06zknm2OR-8XIgBCto94,1611
 clarifai/runners/models/model_runner.py,sha256=3vzoastQxkGRDK8T9aojDsLNBb9A3IiKm6YmbFrE9S0,6241
-clarifai/runners/models/model_servicer.py,sha256=i10oxz4pb1NsTQwkyhccJ3URg88Qn63XiuoBRCnJn9w,2737
-clarifai/runners/models/model_upload.py,sha256=4MD85lYtUwEolZF9nxmiH0zRM69Altv-z3luDlvxEvM,14276
+clarifai/runners/models/model_servicer.py,sha256=L5AuqKDZrsKOnv_Fz1Ld4-nzqehltLTsYAS7NIclm1g,2880
+clarifai/runners/models/model_upload.py,sha256=vd9S_Oq33DO2RyWBcnjIaoll965VkkIYWwceKHaPAxk,14241
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/utils/data_handler.py,sha256=sxy9zlAgI6ETuxCQhUgEXAn2GCsaW1GxpK6GTaMne0g,6966
 clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
@@ -83,9 +83,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=vICRhIreqDSShxLKjHNM2JwzKsf1B4fdXB0ciMcA70k,1945
 clarifai/workflows/utils.py,sha256=nGeB_yjVgUO9kOeKTg4OBBaBz-AwXI3m-huSVj-9W18,1924
 clarifai/workflows/validate.py,sha256=yJq03MaJqi5AK3alKGJJBR89xmmjAQ31sVufJUiOqY8,2556
-clarifai-10.8.7.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-10.8.7.dist-info/METADATA,sha256=VwT5l9f_03dv65G4fsQgcHyEWZcsTOCBmpmodcj3OhE,19479
-clarifai-10.8.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-clarifai-10.8.7.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
-clarifai-10.8.7.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-10.8.7.dist-info/RECORD,,
+clarifai-10.8.8.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.8.8.dist-info/METADATA,sha256=CjYP3nvJUa7UVUi8r5LAvzeMqaypddsVn6eGZ0nFSFA,19479
+clarifai-10.8.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+clarifai-10.8.8.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
+clarifai-10.8.8.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.8.8.dist-info/RECORD,,