clarifai 10.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

clarifai/utils/logging.py

@@ -99,3 +99,10 @@ def get_logger(logger_level: Union[int, str] = logging.NOTSET,
 
   _configure_logger(name, logger_level)
   return logging.getLogger(name)
+
+
+def add_file_handler(logger: logging.Logger, file_path: str, log_level: str = 'WARNING') -> None:
+  """Add a file handler to the logger."""
+  file_handler = logging.FileHandler(file_path)
+  file_handler.setLevel(log_level)
+  logger.addHandler(file_handler)

clarifai/versions.py

@@ -1,6 +1,6 @@
 import os
 
-CLIENT_VERSION = "10.0.0"
+CLIENT_VERSION = "10.1.0"
 OS_VER = os.sys.platform
 PYTHON_VERSION = '.'.join(
     map(str, [os.sys.version_info.major, os.sys.version_info.minor, os.sys.version_info.micro]))

{clarifai-10.0.0.dist-info → clarifai-10.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.0.0
+Version: 10.1.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -30,7 +30,8 @@ Requires-Dist: rich (>=13.4.2)
 Requires-Dist: PyYAML (>=6.0.1)
 Requires-Dist: schema (>=0.7.5)
 Requires-Dist: Pillow (>=9.5.0)
-Requires-Dist: llama-index (>=0.9.27)
+Requires-Dist: inquirerpy (==0.3.4)
+Requires-Dist: llama-index-core (>=0.10.1)
 Requires-Dist: pypdf (>=3.17.4)
 Provides-Extra: all
 Requires-Dist: pycocotools (==2.0.6) ; extra == 'all'
@@ -85,6 +86,7 @@ This is the official Python client for interacting with our powerful [API](https
   * [Smart Image Search](#smart-image-search)
   * [Smart Text Search](#smart-text-search)
   * [Filters](#filters)
+* **[Retrieval Augmented Generation (RAG)](#retrieval-augmented-generation-rag)**
 * **[More Examples](#pushpin-more-examples)**
 
 
@@ -107,9 +109,10 @@ Install from Source:
 ```bash
 git clone https://github.com/Clarifai/clarifai-python.git
 cd clarifai-python
-python3 -m venv env
-source env/bin/activate
-pip3 install -r requirements.txt
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt
+python setup.py install
 ```
 
 
@@ -430,6 +433,26 @@ Input filters allows to filter by input_type, status of inputs and by inputs_dat
 results = search.query(filters=[{'input_types': ['image', 'text']}])
 ```
 
+## Retrieval Augmented Generation (RAG)
+
+You can setup and start your RAG pipeline in 4 lines of code. The setup method automatically creates a new app and the necessary components under the hood. By default it uses the [mistral-7B-Instruct](https://clarifai.com/mistralai/completion/models/mistral-7B-Instruct) model.
+
+```python
+from clarifai.rag import RAG
+
+rag_agent = RAG.setup(user_id="USER_ID")
+rag_agent.upload(folder_path="~/docs")
+rag_agent.chat(messages=[{"role":"human", "content":"What is Clarifai"}])
+```
+
+If you have previously run the setup method, you can instantiate the RAG class with the prompter workflow URL:
+
+```python
+from clarifai.rag import RAG
+
+rag_agent = RAG(workflow_url="WORKFLOW_URL")
+```
+
 ## :pushpin: More Examples
 
 See many more code examples in this [repo](https://github.com/Clarifai/examples).

clarifai-10.1.0.dist-info/RECORD

@@ -0,0 +1,114 @@
+clarifai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
+clarifai/versions.py,sha256=rOO7lQPI_tpNMmnkH5-F2q_L7JJQ_Ee0JGsUM5jGZtA,186
+clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
+clarifai/client/app.py,sha256=AWUngtwF6a0uS9DInf2arz5Aa-vbxt2Ce5WSNvwlAo0,26946
+clarifai/client/base.py,sha256=hv-eC0qAUMQlbAsSP_JgYfW0Z80C8_K5wo0bmMNoKQs,4963
+clarifai/client/dataset.py,sha256=Wq0dsRC8BfmS02NrMlnOyY2uaUYzzj3NALPjibfk-r8,23783
+clarifai/client/input.py,sha256=RDSGE2GdVqj31whRARFIpblm2_qbcbjW_SkvbUwTRio,38430
+clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
+clarifai/client/model.py,sha256=l2HP9qYuI8LpQRcj83f0HlSGTtbHQcUs3z6R-gLsyIg,24634
+clarifai/client/module.py,sha256=zO65sx7QAaziLIeqwWMR-rxrW9mcm2BZX8oXVyJx5WA,3781
+clarifai/client/runner.py,sha256=nP6QKs8Hy_52skr4gBNAfmPaTcYg20qzZDXnM2IxGlM,9679
+clarifai/client/search.py,sha256=pqX3BJmL8V1RKIGuNkbciDNYGoMwJj3k84B9OvpKl10,10555
+clarifai/client/user.py,sha256=6sOoHiBSHKz6zfEh4cjBbUe5CgmYs96RgHdcMmPoKys,9914
+clarifai/client/workflow.py,sha256=yOS9XwlO-zM6aHuM4aYGBHG1zYL0igXeZLJTkCcR3l4,9998
+clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShKJK0,136
+clarifai/client/auth/helper.py,sha256=3lCKo24ZIOlcSh50juJh3ZDagOo_pxEKyoPjWUokYoA,13450
+clarifai/client/auth/register.py,sha256=2CMdBsoVLoTfjyksE6j7BM2tiEc73WKYvxnwDDgNn1k,536
+clarifai/client/auth/stub.py,sha256=KIzJZ8aRB1RzXJeWHDAx19HNdBsblPPHwYLfAkgI3rY,3779
+clarifai/constants/dataset.py,sha256=2QlHF0NMXfAdFlOpEzkNYVZcxSL-dIxq-ZsY_LsIPBA,499
+clarifai/constants/model.py,sha256=LsMkLVkuBpfS4j4yDW9M4O7HxzRpIuSo9qU5T8Wg2Co,217
+clarifai/constants/rag.py,sha256=WcHwToUVIK9ItAhDefaSohQHCLNeR55PSjZ0BFnoZ3U,28
+clarifai/constants/search.py,sha256=_g3S-JEvuygiFfMVK3cl4Ry9erZpt8Zo4ilXL2i3DAE,52
+clarifai/constants/workflow.py,sha256=cECq1xdvf44MCdtK2AbkiuuwhyL-6OWZdQfYbsLKy_o,33
+clarifai/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/datasets/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/datasets/export/inputs_annotations.py,sha256=z7kmU9K5m9F5u3iEyCnuKk8Bb97kqGaixm8vJZYT554,9325
+clarifai/datasets/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/datasets/upload/base.py,sha256=IP4sdBRfThk2l0W1rDWciFrAJnKwVsM-gu4zEslJ2_E,2198
+clarifai/datasets/upload/features.py,sha256=KeVxO36WrL3uqWCN_-aex1k28C5ZRTm6G8SmTtus6KA,1571
+clarifai/datasets/upload/image.py,sha256=Dlt0RM9qWSi4NcbVM1EjS1sp8zfIO3xWZS6TSSLAbVY,7481
+clarifai/datasets/upload/text.py,sha256=ek29V18x5LqmHqc-nmAljQcud9uRjZx8IV_lDX78zsY,1980
+clarifai/datasets/upload/utils.py,sha256=h7mtN9FZXhQQbf47EXczgb-NTY2uOE9AJlE9u4-hDwI,9627
+clarifai/datasets/upload/loaders/README.md,sha256=ag-3lXuvsKTZapvnqBv824rMrVeX0i9U5v1oqhdhvoo,3038
+clarifai/datasets/upload/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/datasets/upload/loaders/coco_captions.py,sha256=t-IaIXukDk1mFdeeqdwe0hLrBLuaF-cZWl2aumGUAls,1297
+clarifai/datasets/upload/loaders/coco_detection.py,sha256=dBYl2a1D7e-N1heXbFK0bImJAuq_lPQ8nxZMa1zq-Ts,2612
+clarifai/datasets/upload/loaders/coco_segmentation.py,sha256=yu9HBHYdKCllF9-6SdQ_2CaKGskE4DdeqCin7zNTN1c,3628
+clarifai/datasets/upload/loaders/imagenet_classification.py,sha256=LuylazxpI5V8fAPGCUxDirGpYMfxzRxix-MEWaCvwxI,1895
+clarifai/datasets/upload/loaders/xview_detection.py,sha256=bSdmEA_YC-uHl-5uSy3HNnxGVAi9I4N_wjOS0hlbW34,6071
+clarifai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/models/api.py,sha256=d3FQQlG0mNDLrfEvchqaVcq4Tgb_TqryNnJtwp3c7sE,10961
+clarifai/models/model_serving/README.md,sha256=Ln8hsyE38J3yiLZruKHjU_hdq9CjzzbDUAO28Xyw1dQ,4060
+clarifai/models/model_serving/__init__.py,sha256=78fiK9LvdGvpMxICmZWqSIyS6BFATjW2s5R6_GgtbPA,645
+clarifai/models/model_serving/constants.py,sha256=uoi8TqEFkdsHhSZu90HOO3R0BmPC3G0z9qA5ER-5H7w,688
+clarifai/models/model_serving/utils.py,sha256=MXeOHsNHiwx9qsRoX-FzBO2Tmbgo_IVwTf3EUmgdtSQ,524
+clarifai/models/model_serving/cli/__init__.py,sha256=Nls28G-fedNw2oQZIkPQSN__TgjJXbG9RDzzuHIM0VI,575
+clarifai/models/model_serving/cli/_utils.py,sha256=oDd885kwX7u5vf-8dssJFyrR3lEof8x4BXt32egaoKA,1722
+clarifai/models/model_serving/cli/base.py,sha256=k4ARNU1koNzGAi9ach6Vpk7hpISZySiYHyKjkBLuHLg,283
+clarifai/models/model_serving/cli/build.py,sha256=Bfa-PuLIGcreiBr_72XKqCS_IlVJdzJudZkINmX082Y,2774
+clarifai/models/model_serving/cli/clarifai_clis.py,sha256=sGDDj7MrlU3goWLQm4H9dCf4lPD2Ojx50_jdIoxb5QM,663
+clarifai/models/model_serving/cli/create.py,sha256=wtKcVi8XSPN-Fx0RrSUxEwH1hm5TbZ_FrCEMIS9yszM,5598
+clarifai/models/model_serving/cli/example_cli.py,sha256=tCm0J4EI0kuuSRhEiPTuraSA-bUYwtEFEHcL1eOXzRI,1039
+clarifai/models/model_serving/cli/login.py,sha256=TYRQALJZUhNvtx2VcChO0y41YXs8-yP9BrShYb9tcOM,743
+clarifai/models/model_serving/cli/upload.py,sha256=8wYviCTLZYjnXhGykGlm0HhjBd_x5PKp7IKiB8BeOGc,6871
+clarifai/models/model_serving/docs/cli.md,sha256=AM45FZag3520ri4Terb0t7_MmLTs7gjHXAf7TYVZjZk,3942
+clarifai/models/model_serving/docs/concepts.md,sha256=ppQADibKQInf9JpfcH7wIpcMndTZ3618or5yzMhGNOE,9376
+clarifai/models/model_serving/docs/dependencies.md,sha256=apwg_IxDBzovtQYXRpWMU9pUqdf0VaS10yMVOYYXhoc,728
+clarifai/models/model_serving/docs/inference_parameters.md,sha256=EFBQs3OGQNH512zoLJKMfFD6WXE_Tzt_Uvts877VvpQ,4111
+clarifai/models/model_serving/docs/model_types.md,sha256=3sALugeBTMspEnlPNWXI8xtWCxjMDQYjrAji_jgqHVo,1013
+clarifai/models/model_serving/model_config/__init__.py,sha256=MLnCl4U2UlL8hkvKbKifFX2nKRjVN63687-gxiKf8g4,734
+clarifai/models/model_serving/model_config/base.py,sha256=Jow6cFvREtWRaaXw1hobWJks0uYsOi9oL973ZPEfIkk,14636
+clarifai/models/model_serving/model_config/config.py,sha256=EWkPcui370QEYJAjlzuLupLlaZF2BgFbK0Jhx_JDHnk,10188
+clarifai/models/model_serving/model_config/inference_parameter.py,sha256=fDPRkwsntaGZWQWOiCW8x0tcyHPeSCYZwBZoZb2oBzw,3924
+clarifai/models/model_serving/model_config/output.py,sha256=uyXY-B9mmoe8lizTpYEBRYI1KDNQh3ihEiEB4Ne65uc,4634
+clarifai/models/model_serving/model_config/model_types_config/multimodal-embedder.yaml,sha256=4wFQ2R8PiJrXR_8AEgUDD-22gY9sK93y9r68mSOOVnw,541
+clarifai/models/model_serving/model_config/model_types_config/text-classifier.yaml,sha256=0hicyQM-R2Za62RaBexdNCkHBDdacwMRVAL8Yk_sVzs,421
+clarifai/models/model_serving/model_config/model_types_config/text-embedder.yaml,sha256=MEnVsO3-SAOFSW7-b0BOSxgUNxdhXfmE98hXstBt104,395
+clarifai/models/model_serving/model_config/model_types_config/text-to-image.yaml,sha256=FPO9ic0R_mcFa3nIGon9z3negy1q6LsPRNmJ-wqGhyw,383
+clarifai/models/model_serving/model_config/model_types_config/text-to-text.yaml,sha256=7u_0kdiR2iEuXTKHtErUzZZ8ghUdep-RuWmJd9i8BdY,371
+clarifai/models/model_serving/model_config/model_types_config/visual-classifier.yaml,sha256=UDq-VtnnnhuI7NCJOYM19kFvcMS0aOvDDMSblPk5iYY,468
+clarifai/models/model_serving/model_config/model_types_config/visual-detector.yaml,sha256=cJsalUTzXclXpgzH9CutpWQqseJNg9FrI7WjU3wpfuQ,852
+clarifai/models/model_serving/model_config/model_types_config/visual-embedder.yaml,sha256=OQYdrY81rD3WNooHRkOiQASvL3XfGG9GGzT61jEsrT8,406
+clarifai/models/model_serving/model_config/model_types_config/visual-segmenter.yaml,sha256=mQLwA1JnnvWZwp26lVxzwfhp1GS7hH9yHh7mtOUt9rY,474
+clarifai/models/model_serving/model_config/triton/__init__.py,sha256=uJUjpRauhVp6_9sN5DRQi7bwIKEtHPKyQqcCVj6Aj2g,719
+clarifai/models/model_serving/model_config/triton/serializer.py,sha256=eYwXfaJkeXMaiQq_EDG4vWOCc1CKfnC_U6dSp2Urak0,4278
+clarifai/models/model_serving/model_config/triton/triton_config.py,sha256=mDZafUByvEgM1vd0QZL8nM-cOCqeR-06iOC2T6x8hr4,4696
+clarifai/models/model_serving/model_config/triton/wrappers.py,sha256=-O8t2AEJXvqJlUNtKtr8CUlxLjheV2GfBtM0sB_B1v0,8660
+clarifai/models/model_serving/repo_build/__init__.py,sha256=jFb0RNG4Jh63TH35_Urv0EyNXVMW8FEC2NVHXhlbvqg,673
+clarifai/models/model_serving/repo_build/build.py,sha256=IlJTjt5YI1alAGv1Fw3kPZeh3yqi45R20rKbWN9vV1s,7195
+clarifai/models/model_serving/repo_build/static_files/_requirements.txt,sha256=lIXMfxC4BP6QA5hraObPOwUS3PK9F2mA0Gf8KvlijQE,34
+clarifai/models/model_serving/repo_build/static_files/base_test.py,sha256=wuwoXk37bgDaLmE-h4KfMoz0Qvr6B-InLzSORYzwF3A,6780
+clarifai/models/model_serving/repo_build/static_files/inference.py,sha256=TejkXZw43mcZD-M9TkfuqMuABz_cliJgf53_Teodtf0,721
+clarifai/models/model_serving/repo_build/static_files/sample_clarifai_config.yaml,sha256=VOFSSb7D_CgRRcqi-plaCH-6hoFO8NAGDNXVSOJGylo,678
+clarifai/models/model_serving/repo_build/static_files/test.py,sha256=GunBqWgTyo0aF5W9ckKz55tGS-wkL9S9TRfytIjB7Eo,1505
+clarifai/models/model_serving/repo_build/static_files/triton/model.py,sha256=l9lkwyeXw9H_K4Om9dGcuylnj4hAlzohspUZkSnQ7Qg,2429
+clarifai/modules/README.md,sha256=mx8pVx6cPp-pP4LcFPT_nX3ngGmhygVK0WiXeD3cbIo,367
+clarifai/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/modules/css.py,sha256=kadCEunmyh5h2yf0-4aysE3ZcZ6qaQcxuAgDXS96yF8,2020
+clarifai/modules/pages.py,sha256=iOoM3RNRMgXlV0qBqcdQofxoXo2RuRQh0h9c9BIS0-I,1383
+clarifai/modules/style.css,sha256=j7FNPZVhLPj35vvBksAJ90RuX5sLuqzDR5iM2WIEhiA,6073
+clarifai/rag/__init__.py,sha256=wu3PzAzo7uqgrEzuaC9lY_3gj1HFiR3GU3elZIKTT5g,40
+clarifai/rag/rag.py,sha256=N4nhjFRqV2bCPE0W4utsFe8F_5ajhHOF95LRbDLUpC8,11661
+clarifai/rag/utils.py,sha256=1FtQ3_URdtMQpHZdGeDLGibhvcAvKQ8J7ctecATLEhs,3435
+clarifai/runners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/runners/example.py,sha256=V0Nc52JkhCm97oaWzKVg71g50M1ltxI9jyPMo6tKU6E,1302
+clarifai/runners/example_llama2.py,sha256=WMGTqv3v9t3ID1rjW9BTLMkIuvyTESL6xHcOO6A220Y,2712
+clarifai/schema/search.py,sha256=JjTi8ammJgZZ2OGl4K6tIA4zEJ1Fr2ASZARXavI1j5c,2448
+clarifai/urls/helper.py,sha256=tjoMGGHuWX68DUB0pk4MEjrmFsClUAQj2jmVEM_Sy78,4751
+clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/utils/logging.py,sha256=F19UmdeJKwIy8Nqo8o0hegf-qJGqzqtQ5Bi0Rz2NP4Q,3582
+clarifai/utils/misc.py,sha256=cC_j0eEsJ8bfnj0oRd2z-Rms1mQbAfLwrSs07hwQuCE,1420
+clarifai/utils/model_train.py,sha256=v4-bsPOOi-jxzwDxdNf2exaWPEpKD7BYcc6w0kMds4o,7832
+clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clarifai/workflows/export.py,sha256=vICRhIreqDSShxLKjHNM2JwzKsf1B4fdXB0ciMcA70k,1945
+clarifai/workflows/utils.py,sha256=nGeB_yjVgUO9kOeKTg4OBBaBz-AwXI3m-huSVj-9W18,1924
+clarifai/workflows/validate.py,sha256=iCEKBTtB-57uE3LVU7D4AI9BRHxIxahk3U1Ro08HP-o,2535
+clarifai-10.1.0.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.1.0.dist-info/METADATA,sha256=zWB-J2f4iI9LDEc9mUTq-xK2TLJs7WzFiLQwnnNtS1g,17381
+clarifai-10.1.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+clarifai-10.1.0.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
+clarifai-10.1.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.1.0.dist-info/RECORD,,

clarifai-10.1.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+clarifai = clarifai.models.model_serving.cli.clarifai_clis:main

clarifai/models/model_serving/cli/deploy_cli.py

@@ -1,123 +0,0 @@
-# Copyright 2023 Clarifai, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Commandline interface for model upload utils."""
-import argparse
-
-from clarifai.client.auth.helper import ClarifaiAuthHelper
-from clarifai.models.api import Models
-from clarifai.models.model_serving.model_config import MODEL_TYPES, get_model_config
-from clarifai.models.model_serving.model_config.inference_parameter import InferParamManager
-
-
-def deploy(model_url,
-           model_id: str = None,
-           model_type: str = None,
-           desc: str = "",
-           update_version: bool = False,
-           inference_params_file: str = ""):
-  # init Auth from env vars
-  auth = ClarifaiAuthHelper.from_env()
-  # init api
-  model_api = Models(auth)
-
-  # parsing model name/type.
-  # if filename having this format: <model_id>_<model-type>
-  # e.i yolov5s_coco_visual-dectector
-  # else user has to input model_type and model_id
-  zip_filename = model_url.split('/')[-1]
-  zip_filename = zip_filename.split('.')[0]
-
-  def _parse_name(name):
-    *id_, type_ = name.split('_')
-    return "_".join(id_), type_
-
-  # parse model_id
-  if not model_id and "_" in zip_filename:
-    model_id = _parse_name(zip_filename)[0]
-  assert model_id, "Can not parse model_id from url, please input it directly"
-  # parse model_type
-  if not model_type and "_" in zip_filename:
-    model_type = _parse_name(zip_filename)[-1]
-  assert model_type, "Can not parse model_type from url, please input it directly"
-  # key map
-  assert model_type in MODEL_TYPES, f"model_type should be one of {MODEL_TYPES}"
-  clarifai_key_map = get_model_config(model_type=model_type).field_maps
-  # inference parameters
-  inference_parameters = InferParamManager(json_path=inference_params_file).get_list_params()
-
-  # if updating new version of existing model
-  if update_version:
-    resp = model_api.post_model_version(
-        model_id=model_id,
-        model_zip_url=model_url,
-        input=clarifai_key_map.input_fields_map,
-        outputs=clarifai_key_map.output_fields_map,
-        param_specs=inference_parameters)
-  # creating new model
-  else:
-    # post model
-    resp = model_api.upload_model(
-        model_id=model_id,
-        model_zip_url=model_url,
-        model_type=model_type,
-        input=clarifai_key_map.input_fields_map,
-        outputs=clarifai_key_map.output_fields_map,
-        description=desc,
-        param_specs=inference_parameters)
-  # response
-  if resp["status"]["code"] != "SUCCESS":
-    raise Exception("Post models failed, details: {}, {}".format(resp["status"]["description"],
-                                                                 resp["status"]["details"]))
-  else:
-    print("Success!")
-    print(f'Model version: {resp["model"]["model_version"]["id"]}')
-
-
-def main():
-  parser = argparse.ArgumentParser(description=__doc__)
-  # args
-  parser.add_argument("--url", type=str, required=True, help="Direct download url of zip file")
-  parser.add_argument("--model_id", type=str, required=False, default="", help="Custom model id.")
-  parser.add_argument(
-      "--model_type",
-      type=str,
-      required=False,
-      choices=MODEL_TYPES,
-      default="",
-      help="Clarifai model type")
-  parser.add_argument(
-      "--desc", type=str, required=False, default="", help="Short desccription of model")
-  parser.add_argument(
-      "--update_version",
-      action="store_true",
-      required=False,
-      help="Update exist model with new version")
-
-  parser.add_argument(
-      "--infer_param",
-      required=False,
-      default="",
-      help="Path to json file contains inference parameters")
-
-  args = parser.parse_args()
-  deploy(
-      model_url=args.url,
-      model_id=args.model_id,
-      desc=args.desc,
-      model_type=args.model_type,
-      update_version=args.update_version,
-      inference_params_file=args.infer_param)
-
-
-if __name__ == "__main__":
-  main()

clarifai/models/model_serving/cli/model_zip.py

@@ -1,61 +0,0 @@
-# Copyright 2023 Clarifai, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Triton model zip commandline interface."""
-
-import argparse
-import zipfile
-from pathlib import Path
-from typing import Union
-
-
-def zip_dir(triton_repository_dir: Union[Path, str], zip_filename: Union[Path, str]):
-  """
-  Generate triton model repository zip file for upload.
-  Args:
-  -----
-  triton_repository_dir: Directory of triton model respository to be zipped
-  zip_filename: Triton model repository zip filename
-
-  Returns:
-  --------
-  None
-  """
-  # Convert to Path object
-  dir = Path(triton_repository_dir)
-
-  with zipfile.ZipFile(zip_filename, "w", zipfile.ZIP_DEFLATED) as zip_file:
-    for entry in dir.rglob("*"):
-      zip_file.write(entry, entry.relative_to(dir))
-
-
-def main():
-  """Triton model zip cli."""
-  parser = argparse.ArgumentParser(__doc__)
-  parser.add_argument(
-      "--triton_model_repository",
-      type=str,
-      required=True,
-      help="Path to the triton model repository to zip.")
-  parser.add_argument(
-      "--zipfile_name",
-      type=str,
-      required=True,
-      help="Name of the zipfile to be created. \
-      <model_name>_<model_type> is the recommended naming convention.e.g. yolov5_visual-detector.zip"
-  )
-  args = parser.parse_args()
-  zip_dir(args.triton_model_repository, args.zipfile_name)
-
-
-if __name__ == "__main__":
-  main()

clarifai/models/model_serving/cli/repository.py

@@ -1,89 +0,0 @@
-# Copyright 2023 Clarifai, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Triton model repository generation commandline interface."""
-
-import argparse
-
-from ..constants import MAX_HW_DIM
-from ..model_config import MODEL_TYPES, get_model_config
-from ..pb_model_repository import TritonModelRepository
-
-
-def dims_type(shape_string: str):
-  """Read list string from cli and convert values to a list of integers."""
-  shape_string = shape_string.replace("[", "").replace("]", "")
-  shapes = list(map(int, shape_string.split(",")))
-  return shapes
-
-
-def model_upload_init():
-  """
-  Clarifai triton model upload commandline tool.
-  """
-  parser = argparse.ArgumentParser(description=__doc__)
-  # TritonModelConfig args
-  parser.add_argument("--model_name", type=str, required=True, help="Inference Model Name")
-  parser.add_argument(
-      "--model_version",
-      type=str,
-      default="1",
-      required=False,
-      help="Triton inference model version name. 1 stands for version 1. \
-    Leave as default value (Recommended).")
-  parser.add_argument(
-      "--model_type",
-      type=str,
-      choices=MODEL_TYPES,
-      required=True,
-      help=f"Clarifai supported model types.\n Model-types-map: {MODEL_TYPES}",
-  )
-  parser.add_argument(
-      "--image_shape",
-      type=dims_type,
-      default="[-1, -1]",
-      required=False,
-      help="(H, W) dims for models with an image input type. H and W each have a max value of 1024",
-  )
-  parser.add_argument(
-      "--repo_dir",
-      type=str,
-      default=".",
-      required=True,
-      help="Directory to create triton repository.")
-  parser.add_argument("--max_bs", type=int, default=1, required=False, help="Max batch size")
-
-  args = parser.parse_args()
-
-  if len(args.image_shape) != 2:
-    raise ValueError(
-        f"image_shape takes 2 values, Height and Width. Got {len(args.image_shape)} values instead."
-    )
-
-  if args.image_shape[0] > MAX_HW_DIM or args.image_shape[1] > MAX_HW_DIM:
-    raise ValueError(
-        f"H and W each have a maximum value of 1024. Got H: {args.image_shape[0]}, W: {args.image_shape[1]}"
-    )
-
-  model_config = get_model_config(args.model_type).make_triton_model_config(
-      model_name=args.model_name,
-      model_version="1",
-      image_shape=args.image_shape,
-      max_batch_size=args.max_bs,
-  )
-
-  triton_repo = TritonModelRepository(model_config)
-  triton_repo.build_repository(args.repo_dir)
-
-
-if __name__ == "__main__":
-  model_upload_init()

clarifai/models/model_serving/docs/custom_config.md

@@ -1,33 +0,0 @@
-## Custom Triton Configurations
-
-The commandline triton model repository generation utils do work with default values for the various triton configurations but a few of these config values can be modified to suit different task specific needs.
-
-* For vision models for instance, different input shapes for the `Height (H)` and `Width (W)` are supported and can be set via the commandline too.i.e.
-```console
-$ clarifai-model-upload-init --model_name <Your model name> \
-		--model_type <select model type from available ones> \
-		--image_shape "H, W"
-		--repo_dir <directory in which to create your model repository>
-```
-`H` and `W` each have a maximum value of 1024.
-`--image_shape` accepts both `"H, W"` and `"[H, W]"` format input.
-
-
-## Generating the triton model repository without the commandline
-
-The triton model repository can be generated via a python script specifying the same values as required in the commandline. Below is a sample of how the code would be structured with `visual_classifier`.
-
-```python
-from clarifai.models.model_serving.model_config import get_model_config, ModelTypes, TritonModelConfig
-from clarifai.models.model_serving.pb_model_repository import TritonModelRepository
-
-model_type = ModelTypes.visual_classifier
-model_config: TritonModelConfig = get_model_config(model_type).make_triton_model_config(
-	model_name="<model_name>",
-	model_version="1",
-	image_shape=<[H,W]>, # 0 < [H,W] <= 1024
-)
-
-triton_repo = TritonModelRepository(model_config)
-triton_repo.build_repository("<dir>")
-```

clarifai/models/model_serving/docs/output.md

@@ -1,28 +0,0 @@
-## Clarifai Model Prediction Output Formats.
-
-Different models return different types of predictions and Clarifai output dataclasses aim at standardizing the output formats per model type for compatibility with the Clarifai API.
-
-Each machine learning modality supported by the Clarifai API has a predefined dataclass output format with all attributes being of numpy ndarray type.
-
-## Supported Formats
-
-Usage:
-```python
-from clarifai.models.model_serving.models.output import VisualDetectorOutput
-```
-| Output Type (dataclass) | Attributes | Attribute Data Type| Attribute Shapes | Description |
-| --- | --- | --- | --- | --- |
-| [VisualDetectorOutput](../models/output.py) | `predicted_bboxes` | float32 | [-1, 4] | A 2D detected bounding boxes array of any length with each element array having a length of exactly 4. All bbox coordinates MUST be normalized between 0 & 1. |
-| | `predicted_labels` | int32 | [-1, 1] | A 2D detected labels array of length equal to that of predicted_bboxes with each element array having a length of exactly 1.
-| | `predicted_scores` | float32 | [-1, 1] | A 2D detection scores array of length equal to that of predicted_bboxes & predicted_labels with each element array having a length of exactly 1.
-| | | | | |
-| [ClassifierOutput](../models/output.py) | `predicted_scores` | float32 | [-1] | The softmax of the model's predictions. The index of each predicted probability as returned by the model must correspond to the label index in the labels.txt file |
-| | | | | |
-| [TextOutput](../models/output.py) | `predicted_text` | string | [1] | Predicted text from a model |
-| | | | | |
-| [EmbeddingOutput](../models/output.py) | `embedding_vector` | float32 | [-1] | The embedding vector (image or text embedding) returned by a model |
-| | | | | |
-| [MasksOutput](../models/output.py) | `predicted_mask` | int64 | [-1, -1] | The model predicted image mask. The predicted class indices must be assigned to the corresponding image pixels in the mask where that class is predicted by the model. |
-| | | | | |
-| [ImageOutput](../models/output.py) | `image` | unint8 | [-1, -1, 3] | The model predicted/generated image |
-| | | | | |