clarifai 10.3.2__tar.gz → 10.5.0__tar.gz

{clarifai-10.3.2/clarifai.egg-info → clarifai-10.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.3.2
+Version: 10.5.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,13 +20,13 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc~=10.2.3
+Requires-Dist: clarifai-grpc>=10.5.0
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0
 Requires-Dist: rich>=13.4.2
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: schema>=0.7.5
+Requires-Dist: schema==0.7.5
 Requires-Dist: Pillow>=9.5.0
 Requires-Dist: inquirerpy==0.3.4
 Requires-Dist: tabulate>=0.9.0
@@ -170,11 +170,14 @@ dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 #Try upload and record the failed outputs in log file.
 from clarifai.datasets.upload.utils import load_module_dataloader
 cifar_dataloader = load_module_dataloader('./image_classification/cifar10')
-dataset.upload_dataset(dataloader=cifar_dataloader, log_warnings =True)
+dataset.upload_dataset(dataloader=cifar_dataloader,
+                       get_upload_status=True,
+                       log_warnings =True)
 
 #Retry upload from logs for `upload_dataset`
+# Set retry_duplicates to True if you want to ingest failed inputs due to duplication issues. by default it is set to 'False'.
 dataset.retry_upload_from_logs(dataloader=cifar_dataloader, log_file_path='log_file.log',
-                               retry_duplicates=False,
+                               retry_duplicates=True,
                                log_warnings=True)
 
 #upload text from csv

{clarifai-10.3.2 → clarifai-10.5.0}/README.md

@@ -135,11 +135,14 @@ dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 #Try upload and record the failed outputs in log file.
 from clarifai.datasets.upload.utils import load_module_dataloader
 cifar_dataloader = load_module_dataloader('./image_classification/cifar10')
-dataset.upload_dataset(dataloader=cifar_dataloader, log_warnings =True)
+dataset.upload_dataset(dataloader=cifar_dataloader,
+                       get_upload_status=True,
+                       log_warnings =True)
 
 #Retry upload from logs for `upload_dataset`
+# Set retry_duplicates to True if you want to ingest failed inputs due to duplication issues. by default it is set to 'False'.
 dataset.retry_upload_from_logs(dataloader=cifar_dataloader, log_file_path='log_file.log',
-                               retry_duplicates=False,
+                               retry_duplicates=True,
                                log_warnings=True)
 
 #upload text from csv

clarifai-10.5.0/VERSION

@@ -0,0 +1 @@
+10.5.0

{clarifai-10.3.2 → clarifai-10.5.0}/clarifai/rag/rag.py

@@ -1,5 +1,4 @@
 import uuid
-from datetime import datetime
 from typing import List
 
 import yaml
@@ -76,7 +75,7 @@ class RAG:
         >>> rag_agent = RAG.setup(app_url=YOUR_APP_URL)
         >>> rag_agent.chat(messages=[{"role":"human", "content":"What is Clarifai"}])
     """
-    now_ts = str(int(datetime.now().timestamp()))
+    now_ts = uuid.uuid4().hex[:10]
     if user_id and not app_url:
       user = User(user_id=user_id, base_url=base_url, pat=pat)
       ## Create an App

{clarifai-10.3.2 → clarifai-10.5.0}/clarifai/versions.py

@@ -1,6 +1,6 @@
 import os
 
-CLIENT_VERSION = "10.3.2"
+CLIENT_VERSION = "10.5.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.3.2 → clarifai-10.5.0/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.3.2
+Version: 10.5.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,13 +20,13 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc~=10.2.3
+Requires-Dist: clarifai-grpc>=10.5.0
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0
 Requires-Dist: rich>=13.4.2
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: schema>=0.7.5
+Requires-Dist: schema==0.7.5
 Requires-Dist: Pillow>=9.5.0
 Requires-Dist: inquirerpy==0.3.4
 Requires-Dist: tabulate>=0.9.0
@@ -170,11 +170,14 @@ dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 #Try upload and record the failed outputs in log file.
 from clarifai.datasets.upload.utils import load_module_dataloader
 cifar_dataloader = load_module_dataloader('./image_classification/cifar10')
-dataset.upload_dataset(dataloader=cifar_dataloader, log_warnings =True)
+dataset.upload_dataset(dataloader=cifar_dataloader,
+                       get_upload_status=True,
+                       log_warnings =True)
 
 #Retry upload from logs for `upload_dataset`
+# Set retry_duplicates to True if you want to ingest failed inputs due to duplication issues. by default it is set to 'False'.
 dataset.retry_upload_from_logs(dataloader=cifar_dataloader, log_file_path='log_file.log',
-                               retry_duplicates=False,
+                               retry_duplicates=True,
                                log_warnings=True)
 
 #upload text from csv

{clarifai-10.3.2 → clarifai-10.5.0}/clarifai.egg-info/requires.txt

@@ -1,10 +1,10 @@
-clarifai-grpc~=10.2.3
+clarifai-grpc>=10.5.0
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0
 rich>=13.4.2
 PyYAML>=6.0.1
-schema>=0.7.5
+schema==0.7.5
 Pillow>=9.5.0
 inquirerpy==0.3.4
 tabulate>=0.9.0

{clarifai-10.3.2 → clarifai-10.5.0}/requirements.txt

@@ -1,10 +1,10 @@
-clarifai-grpc~=10.2.3
+clarifai-grpc>=10.5.0
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0
 rich>=13.4.2
 PyYAML>=6.0.1
-schema>=0.7.5
+schema==0.7.5
 Pillow>=9.5.0
 inquirerpy==0.3.4
 tabulate>=0.9.0

{clarifai-10.3.2 → clarifai-10.5.0}/tests/test_app.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from datetime import datetime
+import uuid
 
 import pytest
 
@@ -8,7 +8,7 @@ from clarifai.client.app import App
 from clarifai.client.user import User
 from clarifai.constants.search import DEFAULT_TOP_K
 
-NOW = str(int(datetime.now().timestamp()))
+NOW = uuid.uuid4().hex[:10]
 MAIN_APP_ID = "main"
 MAIN_APP_USER_ID = "clarifai"
 GENERAL_MODEL_ID = "general-image-recognition"
@@ -96,12 +96,12 @@ class TestApp:
     module = create_app.create_module(CREATE_MODULE_ID, description="CI test module")
     assert module.id == CREATE_MODULE_ID and module.app_id == CREATE_APP_ID and module.user_id == CREATE_APP_USER_ID
 
-  def test_create_runner(self, client):
-    client = User(user_id=CREATE_APP_USER_ID, pat=CLARIFAI_PAT)
-    runner_info = client.create_runner(
-        CREATE_RUNNER_ID, labels=["ci runner"], description="CI test runner")
-    assert runner_info.get("runner_id") == CREATE_RUNNER_ID and runner_info.get(
-        "user_id") == CREATE_APP_USER_ID
+  # def test_create_runner(self, client):
+  #   client = User(user_id=CREATE_APP_USER_ID, pat=CLARIFAI_PAT)
+  #   runner_info = client.create_runner(
+  #       CREATE_RUNNER_ID, labels=["ci runner"], description="CI test runner")
+  #   assert runner_info.get("runner_id") == CREATE_RUNNER_ID and runner_info.get(
+  #       "user_id") == CREATE_APP_USER_ID
 
   def test_get_dataset(self, create_app):
     dataset = create_app.dataset(dataset_id=CREATE_DATASET_ID)
@@ -128,11 +128,11 @@ class TestApp:
       create_app.delete_module(CREATE_MODULE_ID)
       assert "SUCCESS" in caplog.text
 
-  def test_delete_runner(self, caplog):
-    client = User(user_id=CREATE_APP_USER_ID)
-    with caplog.at_level(logging.INFO):
-      client.delete_runner(CREATE_RUNNER_ID)
-      assert "SUCCESS" in caplog.text
+  # def test_delete_runner(self, caplog):
+  #   client = User(user_id=CREATE_APP_USER_ID)
+  #   with caplog.at_level(logging.INFO):
+  #     client.delete_runner(CREATE_RUNNER_ID)
+  #     assert "SUCCESS" in caplog.text
 
   def test_delete_app(self, caplog):
     with caplog.at_level(logging.INFO):

{clarifai-10.3.2 → clarifai-10.5.0}/tests/test_data_upload.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from datetime import datetime
+import uuid
 
 import pytest
 
@@ -8,7 +8,7 @@ from clarifai.client.user import User
 from clarifai.datasets.upload.utils import load_module_dataloader
 
 CREATE_APP_USER_ID = os.environ["CLARIFAI_USER_ID"]
-NOW = str(int(datetime.now().timestamp()))
+NOW = uuid.uuid4().hex[:10]
 CREATE_APP_ID = f"ci_input_app_{NOW}"
 CREATE_DATASET_ID = "ci_input_test_dataset"
 

{clarifai-10.3.2 → clarifai-10.5.0}/tests/test_eval.py

@@ -1,13 +1,13 @@
 import logging
 import os
-from datetime import datetime
+import uuid
 
 import pytest
 
 from clarifai.client.user import User
 
 CREATE_APP_USER_ID = os.environ["CLARIFAI_USER_ID"]
-NOW = str(int(datetime.now().timestamp()))
+NOW = uuid.uuid4().hex[:10]
 CREATE_APP_ID = f"ci_input_app_{NOW}"
 CREATE_DATASET_ID = "ci_input_test_dataset"
 CREATE_MODEL_ID = "ci_input_test_model_1"

{clarifai-10.3.2 → clarifai-10.5.0}/tests/test_model_train.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import time
-from datetime import datetime
+import uuid
 
 import pytest
 import yaml
@@ -9,7 +9,7 @@ import yaml
 from clarifai.client.user import User
 
 CREATE_APP_USER_ID = os.environ["CLARIFAI_USER_ID"]
-NOW = str(int(datetime.now().timestamp()))
+NOW = uuid.uuid4().hex[:10]
 CREATE_APP_ID = f"ci_input_app_{NOW}"
 CREATE_DATASET_ID = "ci_input_test_dataset"
 CREATE_MODEL_ID = "ci_input_test_model"

clarifai-10.3.2/VERSION

@@ -1 +0,0 @@
-10.3.2

{clarifai-10.3.2 → clarifai-10.5.0}/clarifai/client/dataset.py

@@ -416,9 +416,6 @@ class Dataset(Lister, BaseClient):
       log_warnings (bool): True if you want to save log warnings in a file
       kwargs: Additional keyword arguments for retry uploading functionality..
     """
-    #add file handler to log warnings
-    if log_warnings:
-      add_file_handler(self.logger, f"Dataset_Upload{str(int(datetime.now().timestamp()))}.log")
     #set batch size and task
     self.batch_size = min(self.batch_size, batch_size)
     self.task = dataloader.task
@@ -442,6 +439,9 @@ class Dataset(Lister, BaseClient):
     if get_upload_status:
       pre_upload_stats = self.get_upload_status(pre_upload=True)
 
+    #add file handler to log warnings
+    if log_warnings:
+      add_file_handler(self.logger, f"Dataset_Upload{str(int(datetime.now().timestamp()))}.log")
     self._data_upload(dataset_obj, **kwargs)
 
     if get_upload_status: