openvector_dev 0.1.26__tar.gz → 0.1.28__tar.gz

{openvector_dev-0.1.26 → openvector_dev-0.1.28}/PKG-INFO

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

{openvector_dev-0.1.26 → openvector_dev-0.1.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openvector_dev"
-version = "0.1.26"
+version = "0.1.28"
 description = ""
 authors = [
     {name = "p00ler",email = "liveitspain@gmail.com"}

{openvector_dev-0.1.26 → openvector_dev-0.1.28}/src/lein_vector/api/facade.py

@@ -13,7 +13,7 @@ from lein_vector.sentence_transformer import EmbeddingProviderGemini
 log = logging.getLogger(__name__)
 
 class Memory:
-    def __init__(self, short_term, memory_manager, embedder, merge_n: int,
+    def __init__(self, short_term, memory_manager, embedder, redis_conn, merge_n: int,
                  gift_base: float, gift_growth: float, score_threshold: float):
         """
         :param short_term: Кратковременное хранилище сообщений пользователя (RedisShortTermMemory).
@@ -25,6 +25,7 @@ class Memory:
         self.long = memory_manager
         self.embed = embedder
         self._msg_no: dict[int, int] = {}
+        self.r = redis_conn
         self.merge_n = merge_n
 
         self._gift_base = gift_base
@@ -73,6 +74,7 @@ class Memory:
             short_mem,
             long_mem,
             embedder,
+            redis_conn=_redis,
             merge_n=merge_n,
             gift_base=gift_base,
             gift_growth=gift_growth,
@@ -109,8 +111,7 @@ class Memory:
         :param save_pair: Флаг, сохранять ли пару сообщений при достижении block_size
         """
         key = (user_id, bot)
-        curr_no = self._msg_no.get(key, 0) + 1
-        self._msg_no[key] = curr_no
+        curr_no = await self.r.incr(f"msg_no:{bot}:{user_id}")
         ts = datetime.now(UTC).timestamp()
         await self.short.add(
             bot=bot,
@@ -141,12 +142,17 @@ class Memory:
             )
             await self.long.upsert_chunk_with_vector(new_chunk, vector)
 
+        log.info(curr_no % (block_size * self.merge_n))
         if curr_no % (block_size * self.merge_n) == 0:
-            log.debug(f'Summary requested {bot}:{user_id}')
-            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
+            try:
+                log.debug(f'Summary requested {bot}:{user_id}')
+                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
+            except:
+                log.error("Summary failed\n", exc_info=True)
+                return None, None
         else:
             return None, None
 
@@ -169,7 +175,7 @@ class Memory:
             bot=bot,
             embeddings=search_terms_embedded,
             score_threshold=0.72,
-            topk=4,
+            topk=topk,
             filter_={"chunk_type": "type1"},
         )
 
@@ -209,8 +215,7 @@ class Memory:
 
         key = (user_id, bot)
         fails = self._gift_fail.get(key, 0)
-        curr_no = self._msg_no.get(key, 0) + 1
-        self._msg_no[key] = curr_no
+        await self.r.incr(f"msg_no:{bot}:{user_id}")
 
         p0, g = self._gift_base, self._gift_growth
         p = min(1.0, p0 * (g**fails))
@@ -270,6 +275,19 @@ class Memory:
         if old_chunks:
             await self.long.delete_chunks(user_id, old_chunks)
 
+    async def drop_last_short(
+        self, user_id: int, bot: str, n: int = 2
+    ) -> list[dict]:
+        """
+        Удалить N последних сообщений из short-term и вернуть их содержимое.
+        Пригодится, если нужно «отмотать» историю.
+        """
+        removed = await self.short.pop_last(user_id=user_id, bot=bot, n=n)
+        # счётчик сообщений, чтобы merge-триггер продолжал работать
+        if removed:
+            await self.r.decrby(f"msg_no:{bot}:{user_id}", len(removed))
+        return removed
+
     async def delete_memory(self, user_id: int, bot: str) -> None:
         """
         Полная очистка памяти данного (user_id, bot):

{openvector_dev-0.1.26 → openvector_dev-0.1.28}/src/lein_vector/redis_short_term.py

@@ -90,3 +90,18 @@ class RedisShortTermMemory:
             return None
         raw = await self.r.lrange(self._key(user_id, bot=bot), -chunk_size, -1)
         return [self._load(r) for r in raw]
+
+    async def pop_last(self, user_id: int, bot: str, n: int = 2) -> list[dict]:
+        """
+        Снять (и вернуть) N последних сообщений (по-умолчанию 2).
+        Если сообщений меньше – вернёт всё оставшееся.
+        """
+        key = self._key(user_id, bot)
+        pipe = self.r.pipeline()
+        await pipe.rpop(key, n)
+        raw, = await pipe.execute()
+        if raw is None:
+            return []
+        if isinstance(raw, list):
+            return [self._load(x) for x in raw[::-1]]
+        return [self._load(raw)]