openvector_dev 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

lein_vector/api/facade.py

@@ -54,70 +54,6 @@ class Memory:
         long_mem = MemoryManagerQdrant(adapter, embedder)
         return cls(short_mem, long_mem, embedder)
 
-    async def step_user(
-        self, *, bot: str, user_id: int, user_msg: str, topk: int = 3, history_n: int = 20
-    ):
-        """
-        :param bot: Идентификатор бота.
-        :param user_id: Идентификатор пользователя.
-        :param user_msg: Текст сообщения пользователя.
-        :param topk: Количество релевантных чанков из долговременной памяти.
-        :param history_n: Размер окна кратковременной памяти.
-        :returns: Словарь с short_term и long_term сообщениями.
-        """
-        warnings.warn(
-            "Заменили на низкоуровневые методы",
-            DeprecationWarning,
-            stacklevel=2
-        )
-        key = (user_id, bot)
-        curr_no = self._msg_no.get(key, 0) + 1
-        self._msg_no[key] = curr_no
-        await self.short.add(
-            bot=bot,
-            user_id=user_id,
-            role="user",
-            text=user_msg,
-            extra={"msg_no": curr_no},
-        )
-        embedding = await self.embed.get_embedding(user_msg)
-        long_memories = await self.long.retrieve_by_embedding(
-            user_id=user_id,
-            embedding=embedding,
-            topk=topk,
-            filter_={"bot": bot},
-            score_threshold=0.7
-        )
-        short_ctx = await self.short.window(user_id, history_n)
-        return {"short_term": short_ctx, "long_term": long_memories}
-
-    async def step_user_oai(
-        self,
-        user_id: int,
-        user_msg: str,
-        bot: str,
-        *,
-        topk: int = 3,
-        history_n: int = 20,
-    ) -> dict:
-        """
-        :param user_id: Идентификатор пользователя.
-        :param user_msg: Текст сообщения пользователя.
-        :param bot: Идентификатор бота.
-        :param topk: Количество релевантных чанков из долговременной памяти.
-        :param history_n: Размер окна кратковременной памяти.
-        :returns: Данные short_term и long_term в формате OpenAI-совместимого вывода.
-        """
-        warnings.warn(
-            "Заменили на низкоуровневые методы",
-            DeprecationWarning,
-            stacklevel=2
-        )
-        data = await self.step_user(user_id, bot, user_msg, topk=topk, history_n=history_n)
-        data["short_term"] = self._to_openai(data["short_term"])
-        data["long_term"] = self._chunk_texts(data["long_term"])
-        return data
-
     @staticmethod
     def _to_openai(msgs: list[dict]) -> list[dict]:
         """
@@ -195,8 +131,13 @@ class Memory:
         """
         # wtf: Добавить фильтр только саммари
         search_terms = [await self.embed.get_embedding(term) for term in search_terms]
-        return await self.long.retrieve_by_embeddings(user_id, search_terms, topk,
-                                                      bot=bot, score_threshold=0.72, filter_={"chunk_type": "type1"})
+        return await self.long.retrieve_by_embeddings(
+            user_id=user_id,
+            bot=bot,
+            embeddings=search_terms,
+            score_threshold=0.72,
+            filter_={"chunk_type": "type1"},
+        )
 
     async def get_short_memories(self, user_id: int, bot: str, n_memories: int = 20) -> list:
         """

lein_vector/memory_manager_qdrant.py

@@ -52,10 +52,10 @@ class MemoryManagerQdrant(MemoryManagerABC):
 
     async def retrieve_by_embeddings(
         self,
+        bot: str,
         user_id: int,
         embeddings: list[list[float]],
         *,
-        bot: str,
         topk: int = 3,
         filter_: dict[str, Any] | None = None,
         score_threshold: float | None = None,

{openvector_dev-0.1.7.dist-info → openvector_dev-0.1.8.dist-info}/METADATA

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

{openvector_dev-0.1.7.dist-info → openvector_dev-0.1.8.dist-info}/RECORD

@@ -1,10 +1,10 @@
 lein_vector/__init__.py,sha256=ieXy65X4eVzUtSHNvlh00s4aMwKReafNni4s2q68z3Q,496
 lein_vector/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lein_vector/api/facade.py,sha256=f0Cwib5maw4Ae9QEmc5xDkx4Y2ozIzDQUqJ7jOdg2pg,10634
+lein_vector/api/facade.py,sha256=URxGEad8QrhYY6QJTrz552mk_9z8TWi7RB1veykyD-4,7886
 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=pWuIw_wYlvUlt40jbiE92lWzdYaowZKg3XK0Mq0tQrw,1687
-lein_vector/memory_manager_qdrant.py,sha256=gbOyXl3bm3H5EfvStOC6n4sWD85i8zWe97iKp6AvPDw,6175
+lein_vector/memory_manager_qdrant.py,sha256=DFhvtpDl3OxLSpCQiNXnKVSoqQ3475cSDcfE5wF8Njw,6175
 lein_vector/memory_manager_ram.py,sha256=lUATu6U-cZuRHnR6U1L8aJQB8FNK0Wi40vXsZ5fjDgI,6002
 lein_vector/qdrant_adapter.py,sha256=uPhYAp0KmYQhY3DF29JMO1JTbM__xDWGlnZZPor3VKI,4193
 lein_vector/redis_short_term.py,sha256=uCcncjgXAlNAY46b3_Pjvrn_G0NEI16kRRR9hxayzak,3155
@@ -12,6 +12,6 @@ lein_vector/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 lein_vector/schemas/chunk.py,sha256=FSUwaFUSZk2ptoxupsdIfj5HYAMnHnu3eBfNpXCUMpM,1195
 lein_vector/sentence_transformer.py,sha256=gbWtkT01QFFA0IR_Ta-xsfBfb6owDzGnZDKY1g9fvBQ,1851
 lein_vector/short_term.py,sha256=KFot9r26d9TZYLscVT42V0NwufIQUkx-hftOe2p7qLU,1933
-openvector_dev-0.1.7.dist-info/METADATA,sha256=jNE4MlXel9eZ0iNEIg-JaFdIcAOCqBdxVUdVlNoKBqE,3167
-openvector_dev-0.1.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-openvector_dev-0.1.7.dist-info/RECORD,,
+openvector_dev-0.1.8.dist-info/METADATA,sha256=GOE9yKHgwxWZ5jmu8sOpqnz1XBcmKh0dSuP3zoGWOwQ,3167
+openvector_dev-0.1.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+openvector_dev-0.1.8.dist-info/RECORD,,