layernext-beta 2.3.0b0__tar.gz → 2.3.0b1__tar.gz

{layernext-beta-2.3.0b0/layernext_beta.egg-info → layernext-beta-2.3.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layernext-beta
-Version: 2.3.0b0
+Version: 2.3.0b1
 Summary: LayerNext Python SDK
 Author: LayerNext
 Author-email: <support@layernext.ai>

{layernext-beta-2.3.0b0 → layernext-beta-2.3.0b1}/layernext/__init__.py

@@ -8,7 +8,7 @@ from layernext.datalake.constants import (AnnotationUploadType, ItemType, JobSta
                                           SortFieldName, SortOrder, AnnotationShapeType)
 from deprecated import deprecated
 
-__version__ = '2.3.0b0'
+__version__ = '2.3.0b1'
 
 
 class LayerNextClient:
@@ -2056,7 +2056,10 @@ class LayerNextClient:
             collection_id, 
             model_id='default',
             input_resolution=(480,480), 
-            confidence_threshold=0.5  
+            confidence_threshold=0.5,
+            query="",
+            filters={},
+            inference_platform='use_env'   
             ):
         
         session_id = str(datetime.datetime.now().timestamp())
@@ -2072,8 +2075,8 @@ class LayerNextClient:
         
         _automatic_analysis_client = automatic_analysis.AutomaticAnalysisClient(
             self.encoded_key_secret, self.layernext_url)
-        _automatic_analysis_client.model_tag_collection(
-            collection_id, model_id, input_resolution,confidence_threshold,session_id,job_name)
+        res = _automatic_analysis_client.model_tag_collection(
+            collection_id, model_id, input_resolution,confidence_threshold,session_id,job_id,job_name, query, filters, inference_platform)
         
         return {"jobId": job_id}
 
@@ -2090,7 +2093,10 @@ class LayerNextClient:
             item_type, 
             model_id='default', 
             input_resolution=(300,300), 
-            confidence_threshold=0.5   
+            confidence_threshold=0.5,
+            query="",
+            filters={},
+            inference_platform='use_env'    
             ):
         
         session_id = str(datetime.datetime.now().timestamp())
@@ -2106,8 +2112,8 @@ class LayerNextClient:
         
         _automatic_analysis_client = automatic_analysis.AutomaticAnalysisClient(
             self.encoded_key_secret, self.layernext_url)
-        _automatic_analysis_client.model_tag_population(
-            item_type, model_id, input_resolution, confidence_threshold,session_id,job_name)
+        res = _automatic_analysis_client.model_tag_population(
+            item_type, model_id, input_resolution, confidence_threshold,session_id,job_id,job_name, query, filters, inference_platform)
         
         return {"jobId": job_id}
 
@@ -2176,7 +2182,8 @@ class LayerNextClient:
             collection_id, 
             model_id='default',
             query="",
-            filters={}        
+            filters={},
+            inference_platform='use_env'        
             ):
         
         session_id = str(datetime.datetime.now().timestamp())
@@ -2192,9 +2199,9 @@ class LayerNextClient:
         
         _automatic_analysis_client = automatic_analysis.AutomaticAnalysisClient(
             self.encoded_key_secret, self.layernext_url)
-        _automatic_analysis_client.embedding_model_inference_collection(
-            collection_id, model_id, query, filters, session_id, job_name)
-        return {"jobId": job_id}
+        res = _automatic_analysis_client.embedding_model_inference_collection(
+            collection_id, model_id, query, filters, session_id,job_id, job_name , inference_platform)
+        return res
 
 
     def generate_embeddings_to_metalake(
@@ -2202,7 +2209,8 @@ class LayerNextClient:
             item_type='image', 
             model_id='default',
             query="",
-            filters={}     
+            filters={},
+            inference_platform='use_env'     
             ):
         
         session_id = str(datetime.datetime.now().timestamp())
@@ -2218,8 +2226,8 @@ class LayerNextClient:
         
         _automatic_analysis_client = automatic_analysis.AutomaticAnalysisClient(
             self.encoded_key_secret, self.layernext_url)
-        _automatic_analysis_client.model_embedding_population(
-            item_type, model_id, query, filters, session_id, job_name)
+        res = _automatic_analysis_client.model_embedding_population(
+            item_type, model_id, query, filters, session_id,job_id, job_name, inference_platform)
         
         return {"jobId": job_id}
 

{layernext-beta-2.3.0b0 → layernext-beta-2.3.0b1}/layernext/automatic_analysis/__init__.py

@@ -54,7 +54,11 @@ class AutomaticAnalysisClient:
             input_resolution, 
             confidence_threshold,
             session_id,
-            job_name
+            job_id,
+            job_name,
+            query, 
+            filters,
+            inference_platform
             ):
         try:
             validate_confidence(confidence_threshold)
@@ -62,7 +66,7 @@ class AutomaticAnalysisClient:
             application='collection_autotag'
             item_type=""
             self.automatic_analysis.tagger_detail_send(
-                application, collection_id, item_type, model_id, input_resolution, confidence_threshold,session_id,job_name)
+                application, collection_id, item_type, model_id, input_resolution, confidence_threshold,session_id,job_id,job_name, query, filters, inference_platform)
         except ValueError as e:
             print(f"ValueError: {e}")
 
@@ -80,7 +84,11 @@ class AutomaticAnalysisClient:
             input_resolution, 
             confidence_threshold,
             session_id,
-            job_name
+            job_id,
+            job_name,
+            query, 
+            filters,
+            inference_platform
             ):
         try:
             application='population_autotag'
@@ -88,7 +96,7 @@ class AutomaticAnalysisClient:
             validate_confidence(confidence_threshold)
             validate_resolution_input(input_resolution)
             self.automatic_analysis.tagger_detail_send(
-                application,collection_id,item_type,model_id,input_resolution, confidence_threshold,session_id,job_name)
+                application,collection_id,item_type,model_id,input_resolution, confidence_threshold,session_id,job_id,job_name,query,filters, inference_platform)
         except ValueError as e:
             print(f"ValueError: {e}")
 
@@ -154,12 +162,15 @@ class AutomaticAnalysisClient:
             query, 
             filters,
             session_id,
-            job_name):
+            job_id,
+            job_name,
+            inference_platform
+            ):
         
         application ='collection_embedding'
         item_type=""
-        self.automatic_analysis.embedding_detail_send(
-            collection_id, model_id, application,item_type, query, filters, session_id,job_name)
+        return self.automatic_analysis.embedding_detail_send(
+            collection_id, model_id, application,item_type, query, filters, session_id, job_id, job_name, inference_platform)
 
     def model_embedding_population(
             self,
@@ -168,12 +179,14 @@ class AutomaticAnalysisClient:
             query, 
             filters,
             session_id,
-            job_name
+            job_id,
+            job_name,
+            inference_platform
             ):
         try:
             application='population_embedding'
             collection_id=""
-            self.automatic_analysis.embedding_detail_send(
-                collection_id, model_id, application,item_type, query, filters, session_id, job_name)
+            return self.automatic_analysis.embedding_detail_send(
+                collection_id, model_id, application,item_type, query, filters, session_id, job_id, job_name, inference_platform)
         except ValueError as e:
             print(f"ValueError: {e}")

{layernext-beta-2.3.0b0 → layernext-beta-2.3.0b1}/layernext/automatic_analysis/automatic_analysis.py

@@ -22,7 +22,7 @@ class AutomaticAnalysis:
     Making the payload and sending it to the given API endpoint in and handle responses in regarding to autotagging
     """
 
-    def tagger_detail_send(self, application, collection_id, item_type, model_id, input_resolution,confidence_threshold,session_id,job_name):
+    def tagger_detail_send(self, application, collection_id, item_type, model_id, input_resolution, confidence_threshold, session_id, job_id, job_name, query, filters, inference_platform):
         task = Task.AUTO_TAGGING.value
         unique_id = generate_unique_id()
         payload = {
@@ -35,7 +35,10 @@ class AutomaticAnalysis:
             "Confidence" : confidence_threshold,
             "Task"   : task,
             "SessionId":session_id,
-            "JobName":job_name
+            "JobName":job_name,
+            "Query" :query,
+            "Filters":filters,
+            "InferencePlatform":inference_platform
         }
 
         self.automatic_analysis_interface.main_analysis(payload,task)
@@ -62,7 +65,7 @@ class AutomaticAnalysis:
 
         self.automatic_analysis_interface.main_analysis(payload,task)
 
-    def embedding_detail_send(self, collection_id, model_id, application,item_type, query, filters, session_id, job_name):
+    def embedding_detail_send(self, collection_id, model_id, application,item_type, query, filters, session_id, job_id, job_name, inference_platform):
 
         task=Task.EMBEDDING.value
         unique_id = generate_unique_id()
@@ -76,7 +79,8 @@ class AutomaticAnalysis:
             "Query":query,
             "Filters":filters,
             "SessionId":session_id,
-            "JobName":job_name
+            "JobName":job_name,
+            "InferencePlatform":inference_platform
         }
         
         self.automatic_analysis_interface.main_analysis(payload,task)

{layernext-beta-2.3.0b0 → layernext-beta-2.3.0b1}/layernext/automatic_analysis/automatic_analysis_interface.py

@@ -88,7 +88,7 @@ class AutomaticAnalysisInterface:
             "label_list": label_list,
             "task": task
         }
-        url = f'{self.automatic_analysis_url}/model_setup'    
+        url = f'{self.automatic_analysis_url}/model_setup'   
         
         try:
             response = requests.post(url=url, json=payload, headers=hed)

{layernext-beta-2.3.0b0 → layernext-beta-2.3.0b1/layernext_beta.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layernext-beta
-Version: 2.3.0b0
+Version: 2.3.0b1
 Summary: LayerNext Python SDK
 Author: LayerNext
 Author-email: <support@layernext.ai>