waldiez 0.1.9__tar.gz → 0.1.10__tar.gz

{waldiez-0.1.9 → waldiez-0.1.10}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.9
+Version: 0.1.10
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/
 Project-URL: repository, https://github.com/waldiez/waldiez.git
-Author-email: Panagiotis Kasnesis <pkasnesis@thingenious.io>, Lazaros Toumanidis <laztoum@protonmail.com>
+Author-email: Panagiotis Kasnesis <pkasnesis@thingenious.io>, Lazaros Toumanidis <laztoum@protonmail.com>, Stella Ioannidou <stella@humancentered.gr>
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -23,6 +23,7 @@ Requires-Dist: ag2[anthropic]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[bedrock]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[gemini]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[groq]==0.3.2; extra == 'ag2-extras'
+Requires-Dist: ag2[lmm]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[mistral]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[retrievechat-mongodb]==0.3.2; extra == 'ag2-extras'
 Requires-Dist: ag2[retrievechat-pgvector]==0.3.2; extra == 'ag2-extras'
@@ -71,7 +72,7 @@ Description-Content-Type: text/markdown
 
 # Waldiez
 
-![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/waldiez/waldiez.svg)](https://badge.fury.io/py/waldiez)
+![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
 
 Translate a Waldiez flow:
 

{waldiez-0.1.9 → waldiez-0.1.10}/README.md

@@ -1,6 +1,6 @@
 # Waldiez
 
-![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/waldiez/waldiez.svg)](https://badge.fury.io/py/waldiez)
+![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
 
 Translate a Waldiez flow:
 

{waldiez-0.1.9 → waldiez-0.1.10}/pyproject.toml

@@ -4,6 +4,7 @@ description = 'waldiez'
 authors = [
   { name = 'Panagiotis Kasnesis', email = 'pkasnesis@thingenious.io' },
   { name= 'Lazaros Toumanidis', email= 'laztoum@protonmail.com' },
+  { name = 'Stella Ioannidou', email = 'stella@humancentered.gr'}
 ]
 readme = "README.md"
 requires-python = '>=3.10,<3.13'
@@ -65,6 +66,7 @@ ag2_extras =[
     'ag2[gemini]==0.3.2',
     'ag2[together]==0.3.2',
     'ag2[anthropic]==0.3.2',
+    'ag2[lmm]==0.3.2',
     'ag2[mistral]==0.3.2',
     'ag2[groq]==0.3.2',
     'ag2[bedrock]==0.3.2',
@@ -146,8 +148,6 @@ warn_unused_ignores = true
 plugins = [
   'pydantic.mypy'
 ]
-#   'mypy_zope:plugin'
-# ]
 exclude = [
     '.venv',
     '.local',
@@ -200,7 +200,7 @@ unsafe-load-any-extension="no"
 
 [tool.pylint.messages_control]
 enable=["c-extension-no-member"]
-[tool.pylint.fotmat]
+[tool.pylint.format]
 max-line-length=80
 [tool.pylint.similarities]
 ignore-imports="yes"

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.9"
+__version__ = "0.1.10"

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/exporting/agents/agent.py

@@ -26,6 +26,8 @@ def get_agent_class_name(agent: WaldiezAgent) -> str:
     str
         The agent class name.
     """
+    if agent.data.is_multimodal:
+        return "MultimodalConversableAgent"
     if agent.agent_type == "assistant":
         return "AssistantAgent"
     if agent.agent_type == "user":
@@ -63,6 +65,11 @@ def get_agent_imports(agent_class: str) -> Set[str]:
             "from autogen.agentchat.contrib.retrieve_user_proxy_agent "
             "import RetrieveUserProxyAgent"
         )
+    elif agent_class == "MultimodalConversableAgent":
+        imports.add(
+            "from autogen.agentchat.contrib.multimodal_conversable_agent "
+            "import MultimodalConversableAgent"
+        )
     return imports
 
 

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/exporting/agents/rag_user/chroma_utils.py

@@ -32,7 +32,10 @@ def _get_chroma_client_string(agent: WaldiezRagUser) -> Tuple[str, str]:
         # SyntaxError: (unicode error) 'unicodeescape' codec can't decode bytes
         # in position 2-3: truncated \UXXXXXXXX escape
         local_path = Path(agent.retrieve_config.db_config.local_storage_path)
-        client_str += f'PersistentClient(path=r"{local_path}", settings=Settings(anonymized_telemetry=False))'
+        client_str += (
+            f'PersistentClient(path=r"{local_path}", '
+            "settings=Settings(anonymized_telemetry=False))"
+        )
     else:
         client_str += "Client(Settings(anonymized_telemetry=False))"
     return client_str, to_import
@@ -105,7 +108,7 @@ def get_chroma_db_args(
     if to_import_embedding:
         to_import.add(to_import_embedding)
     kwarg_string = (
-        f"            client={client_str},\n"
+        f"            client={agent_name}_client,\n"
         f"            embedding_function={embedding_function_arg},\n"
     )
     # The RAG example:
@@ -115,11 +118,10 @@ def get_chroma_db_args(
     # https://github.com/microsoft/autogen/issues/3551#issuecomment-2366930994
     # manually initializing the collection before running the flow,
     # might be a workaround.
-    content_before = ""
+    content_before = f"{agent_name}_client = {client_str}\n"
     collection_name = agent.retrieve_config.collection_name
     get_or_create = agent.retrieve_config.get_or_create
     if collection_name:
-        content_before = f"{agent_name}_client = {client_str}\n"
         if get_or_create:
             content_before += (
                 f"{agent_name}_client.get_or_create_collection("

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/exporting/agents/rag_user/rag_user.py

@@ -69,6 +69,15 @@ def get_rag_user_retrieve_config_str(
     args_content = "\n".join(before_vector_db)
     # add the vector_db arg
     args_content += f',\n        "vector_db": {vector_db_arg},\n'
+    # we should not need to include the client, but let's do it
+    # to avoid later issues (with telemetry or other client settings)
+    # https://github.com/ag2ai/ag2/blob/main/autogen/agentchat/\
+    #   contrib/retrieve_user_proxy_agent.py#L265-L266
+    if (
+        f"{agent_name}_client" in before_the_args
+        and agent.retrieve_config.vector_db == "chroma"
+    ):
+        args_content += f'        "client": {agent_name}_client,\n'
     args_content += closing_arg
     return before_the_args, args_content, imports
 

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/models/agents/agent/agent_data.py

@@ -40,6 +40,8 @@ class WaldiezAgentData(WaldiezBase):
         A list of skills (id and executor) to register.
     nested_chats : List[WaldiezAgentNestedChat]
         A list of nested chats (triggered_by, messages), to register.
+    is_multimodal: bool
+        A flag to indicate if the agent is multimodal.
     """
 
     model_config = ConfigDict(
@@ -149,3 +151,12 @@ class WaldiezAgentData(WaldiezBase):
             alias="nestedChats",
         ),
     ]
+    is_multimodal: Annotated[
+        bool,
+        Field(
+            False,
+            title="Is multimodal",
+            description="A flag to indicate if the agent is multimodal.",
+            alias="isMultimodal",
+        ),
+    ] = False

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/models/waldiez.py

@@ -145,6 +145,11 @@ class Waldiez:
         """Check if the flow has RAG agents."""
         return any(agent.agent_type == "rag_user" for agent in self.agents)
 
+    @property
+    def has_multimodal_agents(self) -> bool:
+        """Check if the flow has multimodal agents."""
+        return any(agent.data.is_multimodal for agent in self.agents)
+
     @property
     def chats(self) -> List[Tuple[WaldiezChat, WaldiezAgent, WaldiezAgent]]:
         """Get the chats."""
@@ -214,6 +219,8 @@ class Waldiez:
             requirements.add(f"ag2[retrievechat]=={autogen_version}")
         else:
             requirements.add(f"ag2=={autogen_version}")
+        if self.has_multimodal_agents:
+            requirements.add(f"ag2[lmm]=={autogen_version}")
         # ref: https://github.com/ag2ai/ag2/blob/main/setup.py
         models_with_additional_requirements = [
             "together",

{waldiez-0.1.9 → waldiez-0.1.10}/waldiez/runner.py

@@ -235,10 +235,31 @@ class WaldiezRunner:
                 os.environ[var_key] = var_value
 
     def _do_run(
-        self, output_path: Optional[Union[str, Path]]
+        self,
+        output_path: Optional[Union[str, Path]],
+        uploads_root: Optional[Union[str, Path]],
     ) -> Union["ChatResult", List["ChatResult"]]:
-        """Run the Waldiez workflow."""
+        """Run the Waldiez workflow.
+
+        Parameters
+        ----------
+        output_path : Optional[Union[str, Path]]
+            The output path.
+        uploads_root : Optional[Union[str, Path]]
+            The runtime uploads root.
+
+        Returns
+        -------
+        Union[ChatResult, List[ChatResult]]
+            The result(s) of the chat(s).
+        """
         results: Union["ChatResult", List["ChatResult"]] = []
+        if not uploads_root:
+            uploads_root = Path(tempfile.mkdtemp())
+        else:
+            uploads_root = Path(uploads_root)
+        if not uploads_root.exists():
+            uploads_root.mkdir(parents=True)
         temp_dir = Path(tempfile.mkdtemp())
         file_name = "flow.py" if not output_path else Path(output_path).name
         if file_name.endswith((".json", ".waldiez")):
@@ -270,6 +291,7 @@ class WaldiezRunner:
     def _run(
         self,
         output_path: Optional[Union[str, Path]],
+        uploads_root: Optional[Union[str, Path]],
     ) -> Union["ChatResult", List["ChatResult"]]:
         self._install_requirements()
         token = self._stream.get()
@@ -278,13 +300,14 @@ class WaldiezRunner:
             from .io import WaldiezIOStream
 
             with WaldiezIOStream.set_default(token):
-                return self._do_run(output_path)
-        return self._do_run(output_path)
+                return self._do_run(output_path, uploads_root)
+        return self._do_run(output_path, uploads_root)
 
     def run(
         self,
         stream: Optional["WaldiezIOStream"] = None,
         output_path: Optional[Union[str, Path]] = None,
+        uploads_root: Optional[Union[str, Path]] = None,
     ) -> Union["ChatResult", List["ChatResult"]]:
         """Run the Waldiez workflow.
 
@@ -294,11 +317,13 @@ class WaldiezRunner:
             The stream to use, by default None.
         output_path : Optional[Union[str, Path]], optional
             The output path, by default None.
+        uploads_root : Optional[Union[str, Path]], optional
+            The uploads root, to get user-uploaded files, by default None.
 
         Returns
         -------
         Union[ChatResult, List[ChatResult]]
-            The result of the chat(s).
+            The result(s) of the chat(s).
 
         Raises
         ------
@@ -311,7 +336,7 @@ class WaldiezRunner:
         token = self._stream.set(stream)
         file_path = output_path or self._file_path
         try:
-            return self._run(file_path)
+            return self._run(file_path, uploads_root)
         finally:
             self._running = False
             self._stream.reset(token)