openvector_dev 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

lein_vector/api/facade.py

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from datetime import UTC, datetime
+from typing import Optional, Any
 from uuid import UUID, uuid4
 
 import redis.asyncio as aioredis
@@ -114,10 +115,12 @@ class Memory:
                 extra={"msg_no": curr_no},
             )
             await self.long.upsert_chunk_with_vector(new_chunk, vector)
-            # self.short.clear_until(block_size)
 
         if curr_no % (block_size * self.merge_n) == 0:
-            return await self.long.merge_old_chunks(user_id=user_id, bot=bot, chunk_type="type0", n=self.merge_n)
+            merged_text, used_ids = await self.long.merge_old_chunks(user_id=user_id, bot=bot, chunk_type="type0", n=self.merge_n)
+            return merged_text, used_ids
+        else:
+            return None, None
 
     async def get_long_memories(
         self, user_id: int, bot: str, search_terms: list[str], topk: int = 3
@@ -218,8 +221,9 @@ class Memory:
         """
         Удаляет
         :param user_id: Идентификатор пользователя.
+        :param bot: Codename бота
         """
-        await self.long.delete_all(user_id)
+        await self.long.delete_all(user_id, bot)
 
     @staticmethod
     def _chunk_texts(chunks: Sequence[Chunk | ChunkPayload]) -> list[str]:

lein_vector/qdrant_adapter.py

@@ -109,13 +109,21 @@ class QdrantAdapter:
     async def delete_collection(self) -> None:
         await self.client.delete_collection(collection_name=self.collection)
 
-    async def get_all_chunks(self, user_id: int) -> list[ChunkPayload]:
+    async def get_all_chunks(self, user_id: int, bot: str) -> list[ChunkPayload]:
+        """
+        Вернуть ВСЕ чанки заданного пользователя и конкретного бота.
+        """
         q_filter = Filter(
-            must=[FieldCondition(key="user_id", match=MatchValue(value=user_id))]
+            must=[
+                FieldCondition(key="user_id", match=MatchValue(value=user_id)),
+                FieldCondition(key="bot",      match=MatchValue(value=bot)),
+            ]
         )
+
         scroll = await self.client.scroll(
             collection_name=self.collection,
             scroll_filter=q_filter,
             limit=2048,
         )
+
         return [ChunkPayload(**p.payload) for p in scroll[0]]

{openvector_dev-0.1.9.dist-info → openvector_dev-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openvector_dev
-Version: 0.1.9
+Version: 0.1.11
 Summary: 
 Author: p00ler
 Author-email: liveitspain@gmail.com

{openvector_dev-0.1.9.dist-info → openvector_dev-0.1.11.dist-info}/RECORD

@@ -1,17 +1,17 @@
 lein_vector/__init__.py,sha256=ieXy65X4eVzUtSHNvlh00s4aMwKReafNni4s2q68z3Q,496
 lein_vector/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lein_vector/api/facade.py,sha256=OC94eCQnkTgq0BycEEaEMX5YUs5EUtACpiLspYcqusk,9651
+lein_vector/api/facade.py,sha256=GyiIaIf0BlCIs8cb7XdHpIhLIABixlWXKGKgo5CYlB4,9784
 lein_vector/bases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lein_vector/bases/embeding_provider_abc.py,sha256=WBpVC6ra-SYqhJeZs8R8U679wfGebXgwOOVPIii-IvY,265
 lein_vector/bases/memory_manager_abc.py,sha256=NE13Lz-3aX3RjkRhsd5FsezPNk0xju34fFpO3Fa1n9A,1755
 lein_vector/memory_manager_qdrant.py,sha256=jzb04gnESVRH62QSYhnwsl-HpS6Kci721rPA3_6LSDQ,6382
 lein_vector/memory_manager_ram.py,sha256=lUATu6U-cZuRHnR6U1L8aJQB8FNK0Wi40vXsZ5fjDgI,6002
-lein_vector/qdrant_adapter.py,sha256=uPhYAp0KmYQhY3DF29JMO1JTbM__xDWGlnZZPor3VKI,4193
+lein_vector/qdrant_adapter.py,sha256=CJsGvlDdTf4gGCFZIRzfYDeOT_7pzw8pf4VT_QIYDWg,4466
 lein_vector/redis_short_term.py,sha256=uCcncjgXAlNAY46b3_Pjvrn_G0NEI16kRRR9hxayzak,3155
 lein_vector/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lein_vector/schemas/chunk.py,sha256=qq2J7UM94AhKXKg_gnErac5GQF9DCoaEeEHyxZg_xuk,1202
 lein_vector/sentence_transformer.py,sha256=SjjIa43Y7JxcU9VkpT2Ml-CVXb8tqmrbMutZN6O_I6s,1853
 lein_vector/short_term.py,sha256=KFot9r26d9TZYLscVT42V0NwufIQUkx-hftOe2p7qLU,1933
-openvector_dev-0.1.9.dist-info/METADATA,sha256=ZnabZl7TnXLZXj7xFqQk5awRGPzFpuyWnDjMyUAx_Z0,3167
-openvector_dev-0.1.9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-openvector_dev-0.1.9.dist-info/RECORD,,
+openvector_dev-0.1.11.dist-info/METADATA,sha256=60HgtLk0KgO_q7FgIh1pfYt_k1z5R-wyyzFsPYztfVY,3168
+openvector_dev-0.1.11.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+openvector_dev-0.1.11.dist-info/RECORD,,