mixpeek 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

mixpeek/endpoints/index.py

@@ -5,31 +5,29 @@ class Index:
         self.base_url = base_url
         self.headers = headers
 
-    def upload(self, file, collection_id, metadata=None, settings=None):
-        try:
-            url = f"{self.base_url}index/upload"
-            files = {"file": file}
-            data = {
-                "collection_id": collection_id,
-                "metadata": metadata,
-                "settings": settings
-            }
-            response = requests.post(url, files=files, data=data, headers=self.headers)
-            response.raise_for_status()
-            return response.json()
-        except requests.RequestException as e:
-            return {"error": str(e)}
+    def _prepare_data(self, base_data, metadata=None, settings=None):
+        if metadata is not None:
+            base_data["metadata"] = metadata
+        if settings is not None:
+            base_data["settings"] = settings
+        return base_data
+
+    # def upload(self, file, collection_id, metadata=None, settings=None):
+    #     try:
+    #         api_url = f"{self.base_url}index/upload"
+    #         files = {"file": file}
+    #         data = self._prepare_data({"collection_id": collection_id}, metadata, settings)
+    #         response = requests.post(api_url, files=files, data=data, headers=self.headers)
+    #         response.raise_for_status()
+    #         return response.json()
+    #     except requests.RequestException as e:
+    #         return {"error": str(e)}
 
-    def url(self, url, collection_id, metadata=None, settings=None):
+    def url(self, target_url, collection_id, metadata=None, settings=None):
         try:
-            url = f"{self.base_url}index/url"
-            data = {
-                "url": url,
-                "collection_id": collection_id,
-                "metadata": metadata,
-                "settings": settings
-            }
-            response = requests.post(url, json=data, headers=self.headers)
+            endpoint = f"{self.base_url}index/url"
+            data = self._prepare_data({"url": target_url, "collection_id": collection_id}, metadata, settings)
+            response = requests.post(endpoint, json=data, headers=self.headers)
             response.raise_for_status()
             return response.json()
         except requests.RequestException as e:
@@ -37,14 +35,9 @@ class Index:
 
     def youtube(self, youtube_video_id, collection_id, metadata=None, settings=None):
         try:
-            url = f"{self.base_url}index/youtube"
-            data = {
-                "youtube_video_id": youtube_video_id,
-                "collection_id": collection_id,
-                "metadata": metadata,
-                "settings": settings
-            }
-            response = requests.post(url, json=data, headers=self.headers)
+            api_url = f"{self.base_url}index/youtube"
+            data = self._prepare_data({"youtube_video_id": youtube_video_id, "collection_id": collection_id}, metadata, settings)
+            response = requests.post(api_url, json=data, headers=self.headers)
             response.raise_for_status()
             return response.json()
         except requests.RequestException as e:

mixpeek/endpoints/search.py

@@ -1,4 +1,6 @@
 import requests
+import os
+import json
 
 class Search:
     def __init__(self, base_url, headers):
@@ -25,27 +27,32 @@ class Search:
         except requests.RequestException as e:
             return {"error": str(e)}
 
-    def upload(self, file, filters=None, page=1, page_size=10):
-        try:
-            url = f"{self.base_url}search/upload"
-            files = {"file": file}
-            data = {
-                "filters": filters or "{}",
-                "page": page,
-                "page_size": page_size
-            }
-            response = requests.post(url, files=files, data=data, headers=self.headers)
-            response.raise_for_status()
-            return response.json()
-        except requests.RequestException as e:
-            return {"error": str(e)}
+    # def upload(self, file_path, filters=None, page=1, page_size=10):
+    #     try:
+    #         url = f"{self.base_url}search/upload"
+            
+    #         filename = os.path.basename(file_path)
+    #         files = {
+    #             'file': (filename, open(file_path, 'rb'), 'application/octet-stream')
+    #         }
+            
+    #         payload = {
+    #             'filters': json.dumps(filters or {}),
+    #             'page': str(page),
+    #             'page_size': str(page_size)
+    #         }
+            
+    #         response = requests.post(url, headers=self.headers, data=payload, files=files)
+    #         response.raise_for_status()
+    #         return response.json()
+    #     except requests.RequestException as e:
+    #         return {"error": str(e)}
 
-    def url(self, url, input_type="file", filters=None, modality="text", page=1, page_size=10):
+    def url(self, target_url, filters=None, modality="text", page=1, page_size=10):
         try:
             url = f"{self.base_url}search/url"
             data = {
-                "url": url,
-                "input_type": input_type,
+                "url": target_url,
                 "filters": filters or {},
                 "modality": modality,
                 "pagination": {

{mixpeek-0.7.0.dist-info → mixpeek-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mixpeek
-Version: 0.7.0
+Version: 0.7.2
 Summary: Mixpeek Python SDK
 Home-page: https://github.com/mixpeek/mixpeek-python
 Author: Ethan Steininger
@@ -233,8 +233,6 @@ response = client.collections.delete_collection(collection_id="collection_id")
 
 - `collection_id` (str): The ID of the collection to delete.
 
-Certainly! I'll update the README to include information about the `tools` service, specifically the video processing functionality. Here's the addition to the README:
-
 ### Tools
 
 The `tools` module provides utility functions for processing various types of data before embedding or indexing.

{mixpeek-0.7.0.dist-info → mixpeek-0.7.2.dist-info}/RECORD

@@ -4,10 +4,10 @@ mixpeek/exceptions.py,sha256=Orhdo5UFLn3fcWVJtlgkznW8Iy5ndL96h0qTY8zOlDA,235
 mixpeek/endpoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mixpeek/endpoints/collections.py,sha256=ffOBenNHG-mVpjT7kQcOfn78-wjgjdQTVyrloyeAy90,2890
 mixpeek/endpoints/embed.py,sha256=ybDqyIt0oJiwIdH1QSwuV-CPeJgd-zW0etNAcBdgZYE,2290
-mixpeek/endpoints/index.py,sha256=2WcjrRHCMqqj0ddWEkl1f5U81Ni9xKySC1_sdkrhnhM,1857
-mixpeek/endpoints/search.py,sha256=fp78miF5bSWTiQn32NMoth9mlLBsj7NfjNzS6HrEz3Q,2170
+mixpeek/endpoints/index.py,sha256=QgMgys1CCukepCpK351aVXRxEsxBfI2YriX7aaH1NrU,1939
+mixpeek/endpoints/search.py,sha256=u3onbss7Llx0AgcTSRtel6bGO5Ly3jvraXPcA26GzsY,2387
 mixpeek/endpoints/tools.py,sha256=QH3X0tYKr-W_9ApENgP7PeuLJi7Qr9W2jrrgQFH4F2A,3567
-mixpeek-0.7.0.dist-info/METADATA,sha256=kmaWlwIRerVhl4H_6cZHyvE8Kek6S4uNy5V8YDkDqhk,10754
-mixpeek-0.7.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-mixpeek-0.7.0.dist-info/top_level.txt,sha256=EJ8Jc4IhqyUwnUlBwKbs498Ju4O9a-IDh2kXc_lo6Vg,8
-mixpeek-0.7.0.dist-info/RECORD,,
+mixpeek-0.7.2.dist-info/METADATA,sha256=d_YN-IkRgs4iNHw6v7dN9qXg1jT46NvpjI74VqPqwKM,10585
+mixpeek-0.7.2.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+mixpeek-0.7.2.dist-info/top_level.txt,sha256=EJ8Jc4IhqyUwnUlBwKbs498Ju4O9a-IDh2kXc_lo6Vg,8
+mixpeek-0.7.2.dist-info/RECORD,,