fix merge conflict and merge main

Author: 0xrohitgarg

videodb/__about__.py

@@ -1,7 +1,7 @@
 """ About information for videodb sdk"""
 
 
-__version__ = "0.2.2"
+__version__ = "0.2.10"
 __title__ = "videodb"
 __author__ = "videodb"
 __email__ = "[email protected]"

videodb/__init__.py

@@ -11,6 +11,7 @@
     SceneExtractionType,
     MediaType,
     SearchType,
+    Segmenter,
     SubtitleAlignment,
     SubtitleBorderStyle,
     SubtitleStyle,
@@ -41,6 +42,7 @@
     "SubtitleStyle",
     "TextStyle",
     "SceneExtractionType",
+    "Segmenter",
 ]
 
 

videodb/_constants.py

@@ -15,6 +15,7 @@ class SearchType:
     semantic = "semantic"
     keyword = "keyword"
     scene = "scene"
+    llm = "llm"
 
 
 class IndexType:
@@ -36,6 +37,12 @@ class SemanticSearchDefaultValues:
     score_threshold = 0.2
 
 
+class Segmenter:
+    time = "time"
+    word = "word"
+    sentence = "sentence"
+
+
 class ApiPath:
     collection = "collection"
     upload = "upload"
@@ -60,6 +67,10 @@ class ApiPath:
     scene = "scene"
     frame = "frame"
     describe = "describe"
+    storage = "storage"
+    download = "download"
+    title = "title"
+    generate_url = "generate_url"
 
 
 class Status:

videodb/audio.py

@@ -20,6 +20,13 @@ def __repr__(self) -> str:
             f"length={self.length})"
         )
 
+    def generate_url(self) -> str:
+        url_data = self._connection.post(
+            path=f"{ApiPath.audio}/{self.id}/{ApiPath.generate_url}",
+            params={"collection_id": self.collection_id},
+        )
+        return url_data.get("signed_url", None)
+
     def delete(self) -> None:
         """Delete the audio.
 

videodb/client.py

@@ -54,6 +54,7 @@ def get_collection(self, collection_id: Optional[str] = "default") -> Collection
             self.collection_id,
             collection_data.get("name"),
             collection_data.get("description"),
+            collection_data.get("is_public", False),
         )
 
     def get_collections(self) -> List[Collection]:
@@ -69,15 +70,19 @@ def get_collections(self) -> List[Collection]:
                 collection.get("id"),
                 collection.get("name"),
                 collection.get("description"),
+                collection.get("is_public", False),
             )
             for collection in collections_data.get("collections")
         ]
 
-    def create_collection(self, name: str, description: str) -> Collection:
+    def create_collection(
+        self, name: str, description: str, is_public: bool = False
+    ) -> Collection:
         """Create a new collection.
 
         :param name: Name of the collection
         :param description: Description of the collection
+        :param is_public: Make collection public
         :return: :class:`Collection <Collection>` object
         :rtype: :class:`videodb.collection.Collection`
         """
@@ -86,6 +91,7 @@ def create_collection(self, name: str, description: str) -> Collection:
             data={
                 "name": name,
                 "description": description,
+                "is_public": is_public,
             },
         )
         self.collection_id = collection_data.get("id", "default")
@@ -94,6 +100,7 @@ def create_collection(self, name: str, description: str) -> Collection:
             collection_data.get("id"),
             collection_data.get("name"),
             collection_data.get("description"),
+            collection_data.get("is_public", False),
         )
 
     def update_collection(self, id: str, name: str, description: str) -> Collection:
@@ -118,6 +125,7 @@ def update_collection(self, id: str, name: str, description: str) -> Collection:
             collection_data.get("id"),
             collection_data.get("name"),
             collection_data.get("description"),
+            collection_data.get("is_public", False),
         )
 
     def check_usage(self) -> dict:
@@ -136,6 +144,15 @@ def get_invoices(self) -> List[dict]:
         """
         return self.get(path=f"{ApiPath.billing}/{ApiPath.invoices}")
 
+    def download(self, stream_link: str, name: str) -> dict:
+        return self.post(
+            path=f"{ApiPath.download}",
+            data={
+                "stream_link": stream_link,
+                "name": name,
+            },
+        )
+
     def upload(
         self,
         file_path: str = None,

videodb/collection.py

@@ -4,6 +4,8 @@
     Optional,
     Union,
     List,
+    Dict,
+    Any,
 )
 from videodb._upload import (
     upload,
@@ -24,20 +26,38 @@
 class Collection:
     """Collection class to interact with the Collection"""
 
-    def __init__(self, _connection, id: str, name: str = None, description: str = None):
+    def __init__(
+        self,
+        _connection,
+        id: str,
+        name: str = None,
+        description: str = None,
+        is_public: bool = False,
+    ):
         self._connection = _connection
         self.id = id
         self.name = name
         self.description = description
+        self.is_public = is_public
 
     def __repr__(self) -> str:
         return (
             f"Collection("
             f"id={self.id}, "
             f"name={self.name}, "
-            f"description={self.description})"
+            f"description={self.description}), "
+            f"is_public={self.is_public})"
         )
 
+    def delete(self) -> None:
+        """Delete the collection
+
+        :raises InvalidRequestError: If the delete fails
+        :return: None if the delete is successful
+        :rtype: None
+        """
+        self._connection.delete(path=f"{ApiPath.collection}/{self.id}")
+
     def get_videos(self) -> List[Video]:
         """Get all the videos in the collection.
 
@@ -154,6 +174,7 @@ def search(
         result_threshold: Optional[int] = None,
         score_threshold: Optional[float] = None,
         dynamic_score_percentage: Optional[float] = None,
+        filter: List[Dict[str, Any]] = [],
     ) -> SearchResult:
         """Search for a query in the collection.
 
@@ -176,8 +197,22 @@ def search(
             result_threshold=result_threshold,
             score_threshold=score_threshold,
             dynamic_score_percentage=dynamic_score_percentage,
+            filter=filter,
         )
 
+    def search_title(self, query) -> List[Video]:
+        search_data = self._connection.post(
+            path=f"{ApiPath.collection}/{self.id}/{ApiPath.search}/{ApiPath.title}",
+            data={
+                "query": query,
+                "search_type": SearchType.llm,
+            },
+        )
+        return [
+            {"video": Video(self._connection, **result.get("video"))}
+            for result in search_data
+        ]
+
     def upload(
         self,
         file_path: str = None,
@@ -214,3 +249,15 @@ def upload(
             return Audio(self._connection, **upload_data)
         elif media_id.startswith("img-"):
             return Image(self._connection, **upload_data)
+
+    def make_public(self):
+        self._connection.patch(
+            path=f"{ApiPath.collection}/{self.id}", data={"is_public": True}
+        )
+        self.is_public = True
+
+    def make_private(self):
+        self._connection.patch(
+            path=f"{ApiPath.collection}/{self.id}", data={"is_public": False}
+        )
+        self.is_public = False

videodb/image.py

@@ -20,6 +20,13 @@ def __repr__(self) -> str:
             f"url={self.url})"
         )
 
+    def generate_url(self) -> str:
+        url_data = self._connection.post(
+            path=f"{ApiPath.image}/{self.id}/{ApiPath.generate_url}",
+            params={"collection_id": self.collection_id},
+        )
+        return url_data.get("signed_url", None)
+
     def delete(self) -> None:
         """Delete the image.