amsdal_ml 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

amsdal_ml/__about__.py

@@ -1 +1 @@
-__version__ = '0.2.1'
+__version__ = '0.3.0'

amsdal_ml/fileio/base_loader.py

@@ -24,6 +24,7 @@ class FileAttachment:
     type: str  # one of: PLAIN_TEXT, FILE_ID
     content: Any
     metadata: dict[str, Any] | None = None
+    mime_type: str | None = None
 
     def __post_init__(self) -> None:
         if self.metadata is None:
@@ -40,7 +41,7 @@ class FileItem:
     def from_path(path: str, *, filedata: FileData | None = None) -> FileItem:
         # Caller is responsible for lifecycle; loaders may close after upload.
         f = open(path, 'rb')
-        return FileItem(file=f, filename=path.split('/')[-1], filedata=filedata)
+        return FileItem(file=f, filename=path.rsplit('/', 1)[-1], filedata=filedata)
 
     @staticmethod
     def from_bytes(data: bytes, *, filename: str | None = None, filedata: FileData | None = None) -> FileItem:

amsdal_ml/fileio/openai_loader.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import io
 import logging
+import mimetypes
 from collections.abc import Sequence
 from typing import Any
 from typing import BinaryIO
@@ -41,6 +42,12 @@ class OpenAIFileLoader(BaseFileLoader):
 
         up = await self.client.files.create(file=(filename or 'upload.bin', buf), purpose=self.purpose)
 
+        mime_type = None
+        if filedata is not None and filedata.mime:
+            mime_type = filedata.mime
+        else:
+            mime_type = mimetypes.guess_type(filename or "")[0]
+
         meta: dict[str, Any] = {
             'filename': filename,
             'provider': 'openai',
@@ -56,7 +63,7 @@ class OpenAIFileLoader(BaseFileLoader):
         if filedata is not None:
             meta['filedata'] = filedata.model_dump()
 
-        return FileAttachment(type=FILE_ID, content=up.id, metadata=meta)
+        return FileAttachment(type=FILE_ID, content=up.id, metadata=meta, mime_type=mime_type)
 
     async def load(self, item: FileItem) -> FileAttachment:
         return await self._upload_one(item.file, filename=item.filename, filedata=item.filedata)

amsdal_ml/ml_models/openai_model.py

@@ -351,6 +351,13 @@ class OpenAIModel(MLModel):
 
         return None
 
+    def _map_responses_text_config(self, response_format: dict[str, Any]) -> dict[str, Any]:
+        if response_format.get("type") == "json_schema":
+            format_config: dict[str, Any] = {"type": "json_schema"}
+            format_config.update(response_format["json_schema"])
+            return {"format": format_config}
+        return {"format": dict(response_format)}
+
     def _ensure_async_client(self) -> None:
         if self.client is None:
             try:
@@ -403,8 +410,7 @@ class OpenAIModel(MLModel):
 
         return atts
 
-    @staticmethod
-    def _has_file_ids(atts: list[FileAttachment]) -> bool:
+    def _has_file_ids(self, atts: list[FileAttachment]) -> bool:
         return any(a.type == FILE_ID for a in atts)
 
     def _build_input_content(
@@ -416,7 +422,11 @@ class OpenAIModel(MLModel):
                 if a.type == PLAIN_TEXT:
                     parts.append({"type": "input_text", "text": str(a.content)})
                 elif a.type == FILE_ID:
-                    parts.append({"type": "input_file", "file_id": str(a.content)})
+                    mime = (a.mime_type or (a.metadata or {}).get("mime_type") or "").lower()
+                    if mime.startswith("image/"):
+                        parts.append({"type": "input_image", "file_id": str(a.content)})
+                    else:
+                        parts.append({"type": "input_file", "file_id": str(a.content)})
             return [{"role": "user", "content": parts}]
 
         messages = cast(list[StructuredMessage], [dict(msg) for msg in input])
@@ -425,7 +435,11 @@ class OpenAIModel(MLModel):
             if a.type == PLAIN_TEXT:
                 parts.append({"type": "input_text", "text": str(a.content)})
             elif a.type == FILE_ID:
-                parts.append({"type": "input_file", "file_id": str(a.content)})
+                mime = (a.mime_type or (a.metadata or {}).get("mime_type") or "").lower()
+                if mime.startswith("image/"):
+                    parts.append({"type": "input_image", "file_id": str(a.content)})
+                else:
+                    parts.append({"type": "input_file", "file_id": str(a.content)})
 
         if parts:
             messages.append({"role": "user", "content": parts})
@@ -439,8 +453,7 @@ class OpenAIModel(MLModel):
         return f"{prompt}\n\n[ATTACHMENTS]\n" + "\n\n".join(extras)
 
     # ---------- error mapping ----------
-    @staticmethod
-    def _map_openai_error(err: Exception) -> ModelError:
+    def _map_openai_error(self, err: Exception) -> ModelError:
         if isinstance(err, openai.RateLimitError):
             return ModelRateLimitError(str(err))
         if isinstance(err, openai.APIConnectionError):
@@ -532,7 +545,7 @@ class OpenAIModel(MLModel):
             "temperature": self.temperature,
         }
         if response_format:
-            kwargs["response_format"] = response_format
+            kwargs["text"] = self._map_responses_text_config(response_format)
 
         try:
             resp: Any = client.responses.create(**kwargs)
@@ -552,7 +565,7 @@ class OpenAIModel(MLModel):
             "stream": True,
         }
         if response_format:
-            kwargs["response_format"] = response_format
+            kwargs["text"] = self._map_responses_text_config(response_format)
 
         try:
             stream_or_resp = client.responses.create(**kwargs)
@@ -641,7 +654,7 @@ class OpenAIModel(MLModel):
             "temperature": self.temperature,
         }
         if response_format:
-            kwargs["response_format"] = response_format
+            kwargs["text"] = self._map_responses_text_config(response_format)
 
         try:
             resp: Any = await client.responses.create(**kwargs)
@@ -661,7 +674,7 @@ class OpenAIModel(MLModel):
             "stream": True,
         }
         if response_format:
-            kwargs["response_format"] = response_format
+            kwargs["text"] = self._map_responses_text_config(response_format)
 
         try:
             stream_or_resp = await client.responses.create(**kwargs)

{amsdal_ml-0.2.1.dist-info → amsdal_ml-0.3.0.dist-info}/METADATA

@@ -1,14 +1,12 @@
 Metadata-Version: 2.4
 Name: amsdal_ml
-Version: 0.2.1
+Version: 0.3.0
 Summary: amsdal_ml plugin for AMSDAL Framework
 Requires-Python: >=3.11
 Requires-Dist: aiohttp==3.12.15
-Requires-Dist: amsdal-cli>=0.5.7
-Requires-Dist: amsdal-data>=0.5.9
-Requires-Dist: amsdal-models>=0.5.9
-Requires-Dist: amsdal-utils>=0.5.4
-Requires-Dist: amsdal>=0.5.6
+Requires-Dist: amsdal-cli>=0.6.1
+Requires-Dist: amsdal-server>=0.6.2
+Requires-Dist: amsdal>=0.6.0
 Requires-Dist: mcp>=0.1
 Requires-Dist: openai==1.100.2
 Requires-Dist: pydantic-settings~=2.12

{amsdal_ml-0.2.1.dist-info → amsdal_ml-0.3.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amsdal_ml/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=ML7PqsHrTMNNZn8E_rA-LzDCAafMSxMcrmSg8YOi-wo,113896
-amsdal_ml/__about__.py,sha256=PmcQ2PI2oP8irnLtJLJby2YfW6sBvLAmL-VpABzTqwc,22
+amsdal_ml/__about__.py,sha256=3wVEs2QD_7OcTlD97cZdCeizd2hUbJJ0GeIO8wQIjrk,22
 amsdal_ml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_ml/app.py,sha256=K_lUz37_FUQmPwzDakDhVXA_D2SL9z1JtcuHfuBvlKE,184
 amsdal_ml/ml_config.py,sha256=UONMVG2RbKVbaYF-GdlhRQbm8flp52GxBzfqdzuLZ5w,1788
@@ -13,8 +13,8 @@ amsdal_ml/agents/python_tool.py,sha256=qrWOfc9pz1mAU506A-0bgwhkahaNT_t_E7RmSo2sl
 amsdal_ml/agents/retriever_tool.py,sha256=ckSVPahfYQ12E3F5ouPV085LeQinlyxEQrBpRSfJzbU,2220
 amsdal_ml/agents/tool_adapters.py,sha256=GJoAx6rRnf-db_5ExPi5KpbiROF0TetcOAh8-sT1Nf0,3244
 amsdal_ml/fileio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_ml/fileio/base_loader.py,sha256=Ca0_zrRqj9DYSidcbcJAhkZLT_TalYnYhGRoR_RfetA,1868
-amsdal_ml/fileio/openai_loader.py,sha256=Bfe2pfkodggsslU5csg2AKRhwcoxsfpPIhFWSvMKvKY,2560
+amsdal_ml/fileio/base_loader.py,sha256=3uXmhJ9R9FP0OOnzoOF2VvI37FQ55JK0D4f5PusrRWY,1905
+amsdal_ml/fileio/openai_loader.py,sha256=S39Wlpu1xM-WhnN5N-iaFMQ5uuIPlozR1aoGHmGFLt8,2791
 amsdal_ml/mcp_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_ml/mcp_client/base.py,sha256=PifmlAxxlpFkFLLN8VHKV3XbeSXKA4jcE_u4gPacm9U,497
 amsdal_ml/mcp_client/http_client.py,sha256=VFTNZ8b9sboa67_4db0K1R6CtwM6KdVjmH1t_l0FZMk,1765
@@ -50,7 +50,7 @@ amsdal_ml/ml_ingesting/stores/embedding_data.py,sha256=zbYF8l6L4IgNpuLmtNYqxKzvd
 amsdal_ml/ml_ingesting/stores/store.py,sha256=WTX22e_7qCwCPNFmJYNIMwr8Ppkw7NlIri8SEweVoAw,617
 amsdal_ml/ml_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_ml/ml_models/models.py,sha256=w_sFzDqV4L1OUaGzmODU1Y0nCXo19SBeqjvD-W0ROfU,5501
-amsdal_ml/ml_models/openai_model.py,sha256=00-qfaDFA76dAzSAj_P36-pvCKXQepXx6lNbCKnpH0I,24323
+amsdal_ml/ml_models/openai_model.py,sha256=UwrEa1nB0v0krNfv9ZlqPGJu7CLFIyc2uU7Wv1HPxLU,25275
 amsdal_ml/ml_models/utils.py,sha256=fOwRC4gfmmtGIFsI0aXjvSPxEApFsxiQ3Hicx71QykU,146
 amsdal_ml/ml_retrievers/__init__.py,sha256=duWEkdfwbJN05yiJOfzKOK_xERLSxXGPUrCexZ6Ubhw,619
 amsdal_ml/ml_retrievers/adapters.py,sha256=-luzriafS_AZAp8yfINfVX6jTXuGlM9slF-f6UztveY,2983
@@ -67,6 +67,6 @@ amsdal_ml/prompts/nl_query_filter.prompt,sha256=Qeh0qZd59ObAYxql3N3vSfDZc6PBnQUH
 amsdal_ml/prompts/react_chat.prompt,sha256=KGJNaaeutqMtYQ7PBnMCuR9RQQBHBa4VzXfQ4c0D3Js,1953
 amsdal_ml/utils/__init__.py,sha256=Q9ToZTkhPC6TiAx2qR_5Ap06cg94tvxorMfCU2v0xUQ,208
 amsdal_ml/utils/query_utils.py,sha256=DlU1FOwabPqg4CW8xEzhel7KjuCwkYPiB41WX8s7mbc,5496
-amsdal_ml-0.2.1.dist-info/METADATA,sha256=5Yj93gB9KrmJmRTL63dCsYVWtDQng9OhMHBL11bFGXQ,8369
-amsdal_ml-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-amsdal_ml-0.2.1.dist-info/RECORD,,
+amsdal_ml-0.3.0.dist-info/METADATA,sha256=F_UiLzJUSluKu9WFH9IeiAmlSJ7g1iDNqXbfUZZk46M,8300
+amsdal_ml-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+amsdal_ml-0.3.0.dist-info/RECORD,,