MeUtils 2024.12.19.9.30.53__py3-none-any.whl → 2024.12.19.11.21.54__py3-none-any.whl

{MeUtils-2024.12.19.9.30.53.dist-info → MeUtils-2024.12.19.11.21.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.19.9.30.53
+Version: 2024.12.19.11.21.54
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -63,42 +63,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: filetype ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
 Requires-Dist: thefuck ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
 Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
 Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: pymilvus ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
 Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
 Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
 Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
-Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
 Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
+Requires-Dist: pymilvus ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
+Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
 Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.12.19.9.30.53.dist-info → MeUtils-2024.12.19.11.21.54.dist-info}/RECORD

@@ -99,7 +99,7 @@ examples/_openaisdk/openai_embeddings.py,sha256=jQLDB8IkmYiwhMi6OznoxXsIs-aYxQOf
 examples/_openaisdk/openai_files.py,sha256=gfUbKGZg5P7c3kSMfwalIThi_SEs8O-JTqx49bYFtyM,1505
 examples/_openaisdk/openai_god.py,sha256=O8fbhyxiIlVR7pTvBTXgQ2QTwfcZ2MkEIyDe_jp797A,1056
 examples/_openaisdk/openai_groq.py,sha256=_5Ue1yEx0Gp6theFioB_D8kepR0UlqMU96PVGH-LkVY,7363
-examples/_openaisdk/openai_images.py,sha256=vGuKEbHxuK70Ls2PTbWUeET9q88Kncn22YLBp14bMO8,5114
+examples/_openaisdk/openai_images.py,sha256=IZJY6h2Aq0HUWMwOWupwsSKVn11SVeiqSmzaiO0384c,5185
 examples/_openaisdk/openai_json.py,sha256=M4tq_IkzYbmtgbFilGQHmRdJhH0OltiwGk7cK7uc-sQ,1850
 examples/_openaisdk/openai_modelscope.py,sha256=bKBtXpEN3_YxXRwlQEBV1YmjzT396zxByqdB6nxaEGI,1291
 examples/_openaisdk/openai_moon.py,sha256=Y7RrB6SUi9taQOlA50nfGTpQa9ON6XmPmrxtL-hSL8M,1753
@@ -363,7 +363,7 @@ meutils/apis/jiema/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,36
 meutils/apis/jimeng/__init__.py,sha256=a8CE_cOl9jqal0hycwaLm4Mnga8jmZlz9nCze_9bBqA,272
 meutils/apis/jimeng/common.py,sha256=-3YQGGoWsFyX8XyBfdt1AIF2E7_fGbydi85soKSegbo,8672
 meutils/apis/jimeng/files.py,sha256=0x7lWZha0D6zfGfU3ZOxDdpcbfdax8p7szvRZ6B-Vtk,5200
-meutils/apis/jimeng/images.py,sha256=WQjaetfeFHGoI4hhNHMZxTg32zr2LCwbykgPJchZEn4,3471
+meutils/apis/jimeng/images.py,sha256=6oSsXOTDaZ6qkZpWM2SjzE3mX4_Z_RQEJS4bEaDOWsU,3480
 meutils/apis/jimeng/sig.py,sha256=jisL1jCqWEd3PugP4KMZWVQ32OiwwEPFs1jRvxgZmfU,4068
 meutils/apis/jimeng/utils.py,sha256=Ybi2DF1RSXxpxeH387iQGahJhXv5MhYUDtCpPuznP8w,6134
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
@@ -487,7 +487,7 @@ meutils/config_utils/lark_utils/demo.py,sha256=3g0Fs7oLaeW75T60gYWMLgyNg1OnfOjfH
 meutils/config_utils/lark_utils/x.py,sha256=MlMQGhehP9xMEgetxVCX68XFaosfKoW1JA5cZ3JqN2w,1857
 meutils/crawlers/__init__.py,sha256=TBU4xA-IOsHV-0yIkW7YXxn_QT7TT8NncqxO7IykEfs,271
 meutils/data/SimHei.ttf,sha256=-XEnekS5yHP_URkT4XBI2w22ylV-KxudhkeIYFbrILA,10062565
-meutils/data/VERSION,sha256=1nUyP-M5URdGuLyytMxl7mxL-UAHZlHiQuha9wD8f4o,19
+meutils/data/VERSION,sha256=RVF9HNz2vLnr-ERsNO4cbOBWmpnWcb8Oe27R7RTQPiM,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -687,7 +687,7 @@ meutils/schemas/runwayml_types.py,sha256=q6g00kg1PYCDjpw-notgbcUGwRAlIa8kAmU52Zu
 meutils/schemas/siliconflow_types.py,sha256=a8SOf-bh5ZBddqsCqJNPFfw9olxk-bD_ySqTr8d0aZw,8597
 meutils/schemas/step_types.py,sha256=nGTPXZ7RwOF2RTsPBQguLLcIaBxHs4bsZkYa_LalcJ0,648
 meutils/schemas/suno_types.py,sha256=KTdcwaJNDUFiY8izVJSZdGZgEMb0OhdiRR_dJVN-Cz0,14967
-meutils/schemas/task_types.py,sha256=Vnt6xDUOJTxcCuoaMHDMrZg0IdRHQIcEMfSYYMExEhw,4563
+meutils/schemas/task_types.py,sha256=iLIUIfD5fv3_ByQVhSq-p4Wv65yMtVbNwFievRfTsbI,4571
 meutils/schemas/translator_types.py,sha256=xufNQeyim7RhkzAK_J5_JchZfqaUBDXFwMtrPUu1xzI,627
 meutils/schemas/tripo3d_types.py,sha256=mQF65HwHYmczRgAIuXK5hGxWDWNYDq-Xu9pja7Dwy4o,1452
 meutils/schemas/tryblend_types.py,sha256=glZ0diRJvZmfQotcCWYBA832inihy8TvVWxWZ64CzWA,27793
@@ -699,7 +699,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=Jtt1hXRS5C3DHf_wrkjklVcdPllsAFrzvLq9JLuTdtc,2858
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=IIHhpelCpoHLyL4lGqBp8g-_G12h93drfc15EIoAv1k,23176
+meutils/schemas/oneapi/common.py,sha256=20gd8AMSJ9QTmMuQk2XkOpwpGKJJfIiFea9FAbFOfdo,23256
 meutils/schemas/oneapi/icons.py,sha256=T7W5gInBJoHe62wzMimbG_UI-wn3_-rmQ1O4O2z-CQY,1089
 meutils/schemas/oneapi/model_group_info.py,sha256=rGtflYJuFIjk5MsVEvK9JUR4IciX8jfErqeLqf8DIlQ,1586
 meutils/schemas/oneapi/model_info.py,sha256=_uwKEPIIqm7ZYfhmpxtXB2QNsS83SpJY-OaBzvogC9w,772
@@ -827,9 +827,9 @@ meutils/tools/seize.py,sha256=nOKAS63w-Lbi48I0m2MPhdsokUTwxco0laPxYVmW4Mw,1064
 meutils/tools/service_monitor.py,sha256=ibsLtBN2g2DL7ZnLJ8vhiZOiOcqTAyx711djDdBK-3M,1255
 meutils/tools/sys_monitor.py,sha256=6MoyzrItqDUOSjfHcMJmMofQkEPTW36CT_aKui0rg84,429
 meutils/tools/token_monitor.py,sha256=Np-YK-R4P4IPAXyZvMxwvXI4sFmNJQAQK1lSegNaYpA,997
-MeUtils-2024.12.19.9.30.53.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.19.9.30.53.dist-info/METADATA,sha256=fInOqzusrqHngt8lGDv1kHJkmaD279MwFmRKDYIFCI4,6202
-MeUtils-2024.12.19.9.30.53.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.19.9.30.53.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.19.9.30.53.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.19.9.30.53.dist-info/RECORD,,
+MeUtils-2024.12.19.11.21.54.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.19.11.21.54.dist-info/METADATA,sha256=d4jBx0zQBv_gyrbujqBO80_rw10TR2VYUC6_u7X7N7M,6203
+MeUtils-2024.12.19.11.21.54.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.19.11.21.54.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.19.11.21.54.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.19.11.21.54.dist-info/RECORD,,

examples/_openaisdk/openai_images.py

@@ -47,12 +47,13 @@ from openai import OpenAI
 data = {
     'prompt': '一只可爱的边牧在坐公交车，卡通贴纸。动漫3D风格，超写实油画，超高分辨率，最好的质量，8k',
 
-    'model': 'step-1x-medium',
+    # 'model': 'step-1x-medium',
+    'model': 'seededit',
+
     # 'n': 2, 'quality': 'hd', 'response_format': 'url', 'size': '1024x1024', 'style': 'vivid',
     # 'extra_body': {'guidance_scale': 4.5, 'num_inference_steps': 25, 'seed': None, 'negative_prompt': None}
 }
 
-
 from openai import OpenAI
 
 # model = "stable-diffusion-3"
@@ -109,8 +110,6 @@ from openai import OpenAI
 #
 
 
-prompt = '一只可爱的边牧在坐公交车，卡通贴纸。动漫3D风格，超写实油画，超高分辨率，最好的质量，8k'
-
 
 with timer('image'):
     model = 'flux-pro'
@@ -132,7 +131,7 @@ with timer('image'):
     # model = "flux-dev"
 
     client = OpenAI(
-        api_key=os.getenv("OPENAI_API_KEY") + "-359",
+        # api_key=os.getenv("OPENAI_API_KEY") + "-359",
         # api_key='13OafcA8KSNO4XLrBR4DpvgVV9d59KCvPAmEdrtsvOIcU4T50B0EGstjLEqPnBI2N',
 
         # api_key=os.getenv("SILICONFLOW_API_KEY"),
@@ -166,6 +165,7 @@ with timer('image'):
     model = 'stable-diffusion-3-5-large'
     model = 'flux-schnell'
     model = 'flux-schnell'
+    model = 'seededit'
 
     # response = client.images.generate(
     #     model=model,
@@ -176,6 +176,7 @@ with timer('image'):
     #     },
     #     # size="1700x1275"
     # )
+    prompt = '一只可爱的边牧在坐公交车，卡通贴纸。动漫3D风格，超写实油画，超高分辨率，最好的质量，8k'
 
     response = client.images.generate(
         model=model,
@@ -183,7 +184,8 @@ with timer('image'):
 
         # size="1700x1275"
     )
-    print(response.data[0].url)
+
+    logger.debug(bjson(response.model_dump()))
 
 # openai.AuthenticationError: Error code: 401 - {'error': {'message': 'Incorrect API key provided', 'type': 'invalid_api_key'}}
 # openai.APIStatusError: Error code: 402 - {'error': {'message': 'You exceeded your current quota, please check your plan and billing details', 'type': 'quota_exceeded'}}

meutils/apis/jimeng/images.py

@@ -80,7 +80,7 @@ async def get_task(task_id, token):
             task_id=task_id,
             data=task_data,
             message=data.get("errmsg"),
-            status=task_data and "success",
+            status="success" if task_data else None,
         )
 
 

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.19.09.30.53
+2024.12.19.11.21.54

meutils/schemas/oneapi/common.py

@@ -63,6 +63,10 @@ MODEL_PRICE = {
     "api-images-flux.1.1-pro": 0.1,
     "api-images-recraftv3": 0.03,
 
+    "api-images-seededit": 0.1,
+    "seededit": 0.1,
+    "chat-seededit": 0.1,
+
     "api-tripo3d": 0.1,
 
     # 图片 音频 视频

meutils/schemas/task_types.py

@@ -63,7 +63,7 @@ class TaskResponse(BaseModel):
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)
-        self.status = STATUSES.get(self.status.lower(), "UNKNOWN")
+        self.status = STATUSES.get((self.status or '').lower(), "UNKNOWN")
 
     class Config:
         # 允许额外字段，增加灵活性