MeUtils 2025.3.7.22.46.32__py3-none-any.whl → 2025.3.13.19.7.25__py3-none-any.whl

meutils/schemas/openai_types.py

@@ -137,10 +137,11 @@ class CompletionRequest(BaseModel):
                     for content in user_contents:
                         return content.get('text', "")
                 else:
-                    return user_contents
+                    return str(user_contents)
 
     @cached_property
     def last_urls(self):  # file_url 多轮对话需要  sum(request.last_urls.values(), [])
+        """最新一轮的 user url 列表"""
         content_types = {"image_url", "file", "file_url", "video_url", "audio_url"}
         for i, message in enumerate(self.messages[::-1], 1):
             data = {}
@@ -449,6 +450,67 @@ if __name__ == '__main__':
             {"type": "image_url", "image_url": "这是个图片链接"}
         ]},
     ]
+
+    messages = [{'role': 'system',
+                 'content': 'undefined\n Current date: 2025-03-13'},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '解读'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/xx-1741850404348-339a12ba3.png'}]},
+                {},
+                {'role': 'user', 'content': '总结一下'}]
+
+    messages = [{'role': 'system',
+                 'content': 'undefined\n Current date: 2025-03-13'},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '解读'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/xx-1741850404348-339a12ba3.png'}]},
+                {},
+                {'role': 'user', 'content': '总结一下'}]
+
+    messages = [{'role': 'system',
+                 'content': 'undefined\n Current date: 2025-03-13'},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741849647273-c3f3be340.txt'}]},
+                {},
+                {'role': 'user', 'content': '总结'}]
+
+    mesages = [{'role': 'system',
+                'content': 'undefined\n Current date: 2025-03-13'},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user',
+                'content': [{'type': 'text', 'text': '一句话总结'},
+                            {'type': 'image_url',
+                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+               {},
+               {'role': 'user', 'content': '总结'}]
     #
     # r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
     # r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
@@ -458,5 +520,5 @@ if __name__ == '__main__':
     # print(chat_completion)
     # print(chat_completion_chunk_stop)
 
-    # print(CompletionRequest(messages=messages).last_urls)
+    print(CompletionRequest(messages=messages).last_urls)
     print(CompletionRequest(messages=messages).last_user_content)

meutils/caches/c.py

@@ -1,29 +0,0 @@
-import asyncio
-
-from collections import namedtuple
-import redis.asyncio as redis
-
-from aiocache import cached
-from aiocache import RedisCache
-from aiocache.serializers import PickleSerializer
-
-Result = namedtuple('Result', "content, status")
-
-cache = RedisCache(namespace="main", client=redis.Redis(), serializer=PickleSerializer())
-
-
-@cached(cache, ttl=10, key_builder=lambda *args, **kw: "key")
-async def cached_call():
-    return Result("content", 200)
-
-
-async def test_cached():
-    async with cache:
-        await cached_call()
-        exists = await cache.exists("key")
-        assert exists is True
-        await cache.delete("key")
-
-
-if __name__ == "__main__":
-    asyncio.run(test_cached())

meutils/caches/demo.py

@@ -1,28 +0,0 @@
-import asyncio
-
-from collections import namedtuple
-
-from aiocache import cached, Cache, RedisCache
-from aiocache.serializers import PickleSerializer
-# With this we can store python objects in backends like Redis!
-
-Result = namedtuple('Result', "content, status")
-
-
-@cached(
-    cache=RedisCache(), key="key", serializer=PickleSerializer(), port=6379, namespace="main")
-async def cached_call():
-    print("Sleeping for three seconds zzzz.....")
-    await asyncio.sleep(3)
-    return Result("content", 200)
-
-
-async def run():
-    await cached_call()
-    await cached_call()
-    await cached_call()
-    cache = Cache(Cache.REDIS, endpoint="127.0.0.1", port=6379, namespace="main")
-    await cache.delete("key")
-
-if __name__ == "__main__":
-    asyncio.run(run())

meutils/caches/redis_.py

@@ -1,26 +0,0 @@
-import asyncio
-
-from aiocache import Cache
-
-
-cache = Cache(Cache.REDIS, endpoint="127.0.0.1", port=6379, namespace="main")
-
-
-async def redis():
-    await cache.set("key", "value")
-    await cache.set("expire_me", "value", ttl=10)
-
-    assert await cache.get("key") == "value"
-    assert await cache.get("expire_me") == "value"
-    assert await cache.raw("ttl", "main:expire_me") > 0
-
-
-async def test_redis():
-    await redis()
-    await cache.delete("key")
-    await cache.delete("expire_me")
-    await cache.close()
-
-
-if __name__ == "__main__":
-    asyncio.run(test_redis())