clarifai 11.6.4rc1__py3-none-any.whl → 11.6.4rc2__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.6.4rc1"
+__version__ = "11.6.4rc2"

clarifai/cli/model.py

@@ -139,7 +139,7 @@ def init(
     MODEL_PATH: Path where to create the model directory structure. If not specified, the current directory is used by default.
     model_type_id: Type of model to initialize. Options are 'mcp' for MCPModelClass or 'openai' for OpenAIModelClass.
     github_pat: GitHub Personal Access Token for cloning private repositories.
-    github_url: GitHub repository URL or "user/repo" format to clone a repository from. If provided, the entire repository contents will be copied to the target directory instead of using default templates.
+    github_url: GitHub repository URL or "user/repo" format or the github folder URL to clone a model files from. If provided, the entire contents of repo/folder will be copied to the target directory instead of using default templates.
     toolkit: Toolkit to use for model initialization. Currently supports 'ollama'.
     model_name: Model name to configure when using --toolkit. For ollama toolkit, this sets the Ollama model to use (e.g., 'llama3.1', 'mistral', etc.).
     port: Port to run the Ollama server on. Defaults to 23333.

clarifai/runners/server.py

@@ -133,6 +133,7 @@ def serve(
             pat=pat,
             num_parallel_polls=num_threads,
         )
+        logger.info("Runner started successfully and is waiting for work from the API...")
         runner.start()  # start the runner to fetch work from the API.
 
 

clarifai/runners/utils/code_script.py

@@ -44,62 +44,66 @@ def generate_client_script(
             model_id,
         )
 
-        _CLIENT_TEMPLATE = """
+        _CLIENT_TEMPLATE = f"""
 import asyncio
 import os
+
 from fastmcp import Client
 from fastmcp.client.transports import StreamableHttpTransport
 
-transport = StreamableHttpTransport(url="%s",
-                                    headers={"Authorization": "Bearer " + os.environ["CLARIFAI_PAT"]})
+transport = StreamableHttpTransport(
+    url="{mcp_url}",
+    headers={{"Authorization": "Bearer " + os.environ["CLARIFAI_PAT"]}},
+)
 
 async def main():
-  async with Client(transport) as client:
-    tools = await client.list_tools()
-    print(f"Available tools: {tools}")
-    # TODO: update the dictionary of arguments passed to call_tool to make sense for your MCP.
-    result = await client.call_tool(tools[0].name, {"a": 5, "b": 3})
-    print(f"Result: {result[0].text}")
+    async with Client(transport) as client:
+        tools = await client.list_tools()
+        print(f"Available tools: {{tools}}")
+        # TODO: update the dictionary of arguments passed to call_tool to make sense for your MCP.
+        result = await client.call_tool(tools[0].name, {{"a": 5, "b": 3}})
+        print(f"Result: {{result[0].text}}")
 
 if __name__ == "__main__":
-  asyncio.run(main())
+    asyncio.run(main())
 """
-        return _CLIENT_TEMPLATE % mcp_url
+        return _CLIENT_TEMPLATE
 
     if has_signature_method(OPENAI_TRANSPORT_NAME, method_signatures):
         openai_api_base = url_helper.openai_api_url()
         model_ui_url = url_helper.clarifai_url(user_id, app_id, "models", model_id)
-        _CLIENT_TEMPLATE = """
+        _CLIENT_TEMPLATE = f"""
 import os
+
 from openai import OpenAI
 
 client = OpenAI(
-    base_url="%s",
+    base_url="{openai_api_base}",
     api_key=os.environ['CLARIFAI_PAT'],
 )
+
 response = client.chat.completions.create(
-    model="%s",
+    model="{model_ui_url}",
     messages=[
-        {"role": "system", "content": "Talk like a pirate."},
-        {
+        {{"role": "system", "content": "Talk like a pirate."}},
+        {{
             "role": "user",
             "content": "How do I check if a Python object is an instance of a class?",
-        },
+        }},
     ],
     temperature=0.7,
-    stream=False, # stream=True also works, just iterator over the response
+    stream=False,  # stream=True also works, just iterator over the response
 )
 print(response)
 """
-        return _CLIENT_TEMPLATE % (openai_api_base, model_ui_url)
-
-    _CLIENT_TEMPLATE = """\
-import os
-
-from clarifai.client import Model
-from clarifai.runners.utils import data_types
-{model_section}
-    """
+        return _CLIENT_TEMPLATE
+    # Generate client template
+    _CLIENT_TEMPLATE = (
+        "import os\n\n"
+        "from clarifai.client import Model\n"
+        "from clarifai.runners.utils import data_types\n\n"
+        "{model_section}\n"
+    )
     if deployment_id and (compute_cluster_id or nodepool_id):
         raise ValueError(
             "You can only specify one of deployment_id or compute_cluster_id and nodepool_id."
@@ -108,26 +112,26 @@ from clarifai.runners.utils import data_types
         deployment_id = None
     else:
         deployment_id = (
-            "os.environ['CLARIFAI_DEPLOYMENT_ID']" if not deployment_id else repr(deployment_id)
+            'os.environ["CLARIFAI_DEPLOYMENT_ID"]' if not deployment_id else repr(deployment_id)
         )
 
     deployment_line = (
-        f'deployment_id = {deployment_id}, # Only needed for dedicated deployed models'
+        f'deployment_id={deployment_id},  # Only needed for dedicated deployed models'
         if deployment_id
         else ""
     )
     compute_cluster_line = (
-        f'compute_cluster_id = "{compute_cluster_id}",' if compute_cluster_id else ""
+        f'compute_cluster_id="{compute_cluster_id}",' if compute_cluster_id else ""
     )
     nodepool_line = (
-        f'nodepool_id = "{nodepool_id}", # Only needed for dedicated nodepool'
+        f'nodepool_id="{nodepool_id}",  # Only needed for dedicated nodepool'
         if nodepool_id
         else ""
     )
 
     base_url_str = ""
     if base_url is not None:
-        base_url_str = f"base_url='{base_url}',"
+        base_url_str = f'base_url="{base_url}",'
 
     # Join all non-empty lines
     optional_lines = "\n    ".join(
@@ -138,19 +142,17 @@ from clarifai.runners.utils import data_types
 
     if use_ctx:
         model_section = """
-model = Model.from_current_context()"""
+model = Model.from_current_context()
+"""
     else:
         model_ui_url = url_helper.clarifai_url(user_id, app_id, "models", model_id)
-        model_section = f"""
-model = Model("{model_ui_url}",
-    {optional_lines}
- )
-"""
+        if optional_lines:
+            model_args = f'"{model_ui_url}",\n    {optional_lines}'
+        else:
+            model_args = f'"{model_ui_url}"'
+        model_section = f"model = Model(\n    {model_args}\n)"
 
-    # Generate client template
-    client_template = _CLIENT_TEMPLATE.format(
-        model_section=model_section,
-    )
+    client_template = _CLIENT_TEMPLATE.format(model_section=model_section.strip("\n"))
 
     # Generate method signatures
     method_signatures_str = []
@@ -158,8 +160,9 @@ model = Model("{model_ui_url}",
         if method_signature is None:
             continue
         method_name = method_signature.name
-        client_script_str = f'response = model.{method_name}('
+        client_script_str = f"response = model.{method_name}("
         annotations = _get_annotations_source(method_signature)
+        param_lines = []
         for idx, (param_name, (param_type, default_value, required)) in enumerate(
             annotations.items()
         ):
@@ -172,8 +175,11 @@ model = Model("{model_ui_url}",
             if param_type == "str" and default_value is not None:
                 default_value = json.dumps(default_value)
             if default_value is not None:
-                client_script_str += f"{param_name}={default_value}, "
-        client_script_str = client_script_str.rstrip(", ") + ")"
+                param_lines.append(f"    {param_name}={default_value},")
+        if param_lines:
+            client_script_str += "\n" + "\n".join(param_lines) + "\n)"
+        else:
+            client_script_str += ")"
         if method_signature.method_type == resources_pb2.RunnerMethodType.UNARY_UNARY:
             client_script_str += "\nprint(response)"
         elif method_signature.method_type == resources_pb2.RunnerMethodType.UNARY_STREAMING:
@@ -191,7 +197,7 @@ model = Model("{model_ui_url}",
         )
     script_lines.append("# Example usage:")
     script_lines.append(client_template)
-    script_lines.append("# Example model prediction from different model methods: \n")
+    script_lines.append("# Example model prediction from different model methods:\n")
     script_lines.append(method_signatures_str)
     script_lines.append("")
     script = "\n".join(script_lines)

clarifai/utils/misc.py

@@ -242,7 +242,8 @@ class GitHubDownloader:
             return owner, repo, branch, folder_path
 
         except Exception as e:
-            raise ValueError(f"Failed to parse GitHub URL: {e}")
+            logger.error(f"Failed to parse GitHub URL: {e}")
+            sys.exit(1)
 
     def get_folder_contents(self, owner: str, repo: str, path: str, branch: str = 'main') -> list:
         api_url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"

{clarifai-11.6.4rc1.dist-info → clarifai-11.6.4rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.6.4rc1
+Version: 11.6.4rc2
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

{clarifai-11.6.4rc1.dist-info → clarifai-11.6.4rc2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=IhAUqR6EdKamjSDzcP15aKGyFnqcPJqpjn88f3ub6UM,26
+clarifai/__init__.py,sha256=ar7JD6Boa57AqjHY4xavUrsMXIAHf60c96qtzrGWFPg,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=GXa6D4v_L404J83jnRNFPH7s-1V9lk7w6Ws99f1g-AY,2772
 clarifai/versions.py,sha256=ecSuEB_nOL2XSoYHDw2n23XUbm_KPOGjudMXmQrGdS8,224
@@ -14,7 +14,7 @@ clarifai/cli/__main__.py,sha256=7nPbLW7Jr2shkgMPvnxpn4xYGMvIcnqluJ69t9w4H_k,74
 clarifai/cli/base.py,sha256=yFfC7POW9BMcUoBn134n9RC0BWkhP_BMDYsVwWeA9SE,8801
 clarifai/cli/compute_cluster.py,sha256=8Xss0Obrp6l1XuxJe0luOqU_pf8vXGDRi6jyIe8qR6k,2282
 clarifai/cli/deployment.py,sha256=9C4I6_kyMxRkWl6h681wc79-3mAtDHtTUaxRv05OZMs,4262
-clarifai/cli/model.py,sha256=nyGxg8DvnfOpmN-mvH13KT8dgmxL_F_ChV761sHRaV8,42155
+clarifai/cli/model.py,sha256=qg7UtVSJcNS20QqF9rFaDNwPvMWLFSO0TPlXyN322mI,42185
 clarifai/cli/model_templates.py,sha256=_ZonIBnY9KKSJY31KZbUys_uN_k_Txu7Dip12KWfmSU,9633
 clarifai/cli/nodepool.py,sha256=H6OIdUW_EiyDUwZogzEDoYmVwEjLMsgoDlPyE7gjIuU,4245
 clarifai/cli/pipeline.py,sha256=smWPCK9kLCqnjTCb3w8BAeiAcowY20Bdxfk-OCzCi0I,10601
@@ -192,7 +192,7 @@ clarifai/rag/__init__.py,sha256=wu3PzAzo7uqgrEzuaC9lY_3gj1HFiR3GU3elZIKTT5g,40
 clarifai/rag/rag.py,sha256=EG3GoFrHFCmA70Tz49_0Jo1-3WIaHSgWGHecPeErcdc,14170
 clarifai/rag/utils.py,sha256=_gVZdABuMnraCKViLruV75x0F3IpgFXN6amYSGE5_xc,4462
 clarifai/runners/__init__.py,sha256=wXLaSljH7qLeJCrZdKEnlQh2tNqTQAIZKWOu2rZ6wGs,279
-clarifai/runners/server.py,sha256=ic1qI-ZhlePCpJDP94hWIf8X-_D1fiEp2CdtaMvFFMk,4780
+clarifai/runners/server.py,sha256=6leCkPkbxtfQyrSNUK_MlwArBcR3K1q1gYqFFsl9bkQ,4871
 clarifai/runners/__pycache__/__init__.cpython-311.pyc,sha256=Z5FOMAOomAbAQ_OUT-YYc4PVkn89DF5aLAOCWMtm2CU,533
 clarifai/runners/__pycache__/__init__.cpython-39.pyc,sha256=ar7ZlbFKLRjwEDdldGPsPF4AH8o_vGUQCXfFgq7WvtY,443
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=nEnIMqzhAXDbd0Ht7QQm0U7AVPIHWQD6kYnFZ0TKJUM,2428
@@ -222,7 +222,7 @@ clarifai/runners/pipeline_steps/pipeline_step_builder.py,sha256=X2xWg4QM4kX3cr8J
 clarifai/runners/pipelines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/pipelines/pipeline_builder.py,sha256=z_bCwjwQPFa_1AYkorhh5r6t6r5hC5K2D8Z1LTEzIpg,12801
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/utils/code_script.py,sha256=toHoQQ2UGGmAxhFrbHo8217eJpUbAa-8RyPzTzfqXvk,14031
+clarifai/runners/utils/code_script.py,sha256=dzvHKgD-3B25KtQVCnCLz9rGzvgrxi4w7DoVkd6AxaI,14312
 clarifai/runners/utils/const.py,sha256=MK7lTzzJKbOiyiUtG_jlJXfz_xNKMn5LjkQ9vjbttXE,1538
 clarifai/runners/utils/data_handler.py,sha256=sxy9zlAgI6ETuxCQhUgEXAn2GCsaW1GxpK6GTaMne0g,6966
 clarifai/runners/utils/data_types.py,sha256=ag08V9CYV9Rm2W0QkKkG6VwpiqUdW7LAynm4dB1RPR4,13606
@@ -264,7 +264,7 @@ clarifai/utils/cli.py,sha256=1pMzWSFg2eqw74oitKc7O99pgr7hmyAXFHDiEFfACsQ,7332
 clarifai/utils/config.py,sha256=jMSWYxJfp_D8eoGqz-HTdsngn5bg_1ymjLidYz6rdLA,7073
 clarifai/utils/constants.py,sha256=gveZo_k_v6itX_ImnCjo8HVVNDqa4Z3m3Mk7El5brHw,2313
 clarifai/utils/logging.py,sha256=0we53uTqUvzrulC86whu-oeWNxn1JjJL0OQ98Bwf9vo,15198
-clarifai/utils/misc.py,sha256=v_1KX0mN3RjitNJJs1ExzDWahFQJV2L2hGZQn18eZXg,20904
+clarifai/utils/misc.py,sha256=_FqRkBO1EC9rBd1C1fsNvoHCy-l6nYb9HIx0StnVf3A,20924
 clarifai/utils/model_train.py,sha256=0XSAoTkSsrwf4f-W9yw2mkXZtkal7LBLJSoi86CFCn4,9250
 clarifai/utils/protobuf.py,sha256=VMhnNsPuWQ16VarKm8BOr5zccXMe26UlrxdJxIzEZNM,6220
 clarifai/utils/__pycache__/__init__.cpython-311.pyc,sha256=flXj0n7hHiXQ36N-q7345qS1XLIpFvt3KWvYMaI_rrU,193
@@ -293,9 +293,9 @@ clarifai/workflows/__pycache__/__init__.cpython-311.pyc,sha256=ZLPuiL5wZcQj_tGzX
 clarifai/workflows/__pycache__/export.cpython-311.pyc,sha256=wllNwGH9vZV13mr8nP50RIotZMc-ihdqZrPlmIvole0,3694
 clarifai/workflows/__pycache__/utils.cpython-311.pyc,sha256=9OjCazsf84YXB-yel33SMzo2dN5SzfTJE1Qu5ehP5Vo,3357
 clarifai/workflows/__pycache__/validate.cpython-311.pyc,sha256=7jRomDKdaSjADi0uIrUyEQyxUBvbdZKPZat_UtzDkoo,3529
-clarifai-11.6.4rc1.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.6.4rc1.dist-info/METADATA,sha256=LnWEJ_OsqSw1oqMCKcVG4lz5nETQusbVbutu5nEx3dc,22740
-clarifai-11.6.4rc1.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-clarifai-11.6.4rc1.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.6.4rc1.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.6.4rc1.dist-info/RECORD,,
+clarifai-11.6.4rc2.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.6.4rc2.dist-info/METADATA,sha256=-X9GLWKAYI8mlP2SDCkcdvp8K5C0-Fn7c_vHhBHqoZw,22740
+clarifai-11.6.4rc2.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+clarifai-11.6.4rc2.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.6.4rc2.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.6.4rc2.dist-info/RECORD,,