waldiez 0.1.1__tar.gz → 0.1.3__tar.gz

{waldiez-0.1.1 → waldiez-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.1
+Version: 0.1.3
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/py/
 Project-URL: repository, https://github.com/waldiez/py.git
@@ -177,4 +177,4 @@ io_stream.close()
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/py/blob/main/LICENSE) file for details.

{waldiez-0.1.1 → waldiez-0.1.3}/README.md

@@ -103,4 +103,4 @@ io_stream.close()
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/py/blob/main/LICENSE) file for details.

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/agents/rag_user/rag_user.py

@@ -1,6 +1,6 @@
 """RAG User related exporting utils."""
 
-from typing import Dict, Set, Tuple
+from typing import Dict, List, Set, Tuple, Union
 
 from waldiez.models import (
     WaldiezAgent,
@@ -9,7 +9,7 @@ from waldiez.models import (
     WaldiezRagUserRetrieveConfig,
 )
 
-from ...utils import get_object_string
+from ...utils import get_object_string, get_path_string
 from .vector_db import get_rag_user_vector_db_string
 
 
@@ -60,6 +60,7 @@ def get_rag_user_retrieve_config_str(
             "\n\n"
         )
         args_dict["custom_text_split_function"] = text_split_arg_name
+    # docs_path = args_dict.pop("docs_path", [])
     args_content = get_object_string(args_dict)
     # get the last line (where the dict ends)
     args_parts = args_content.split("\n")
@@ -131,9 +132,9 @@ def _get_args_dict(
     agent: WaldiezRagUser,
     retrieve_config: WaldiezRagUserRetrieveConfig,
     model_names: Dict[str, str],
-) -> Dict[str, str]:
+) -> Dict[str, Union[str, List[str]]]:
     model_arg = _get_model_arg(agent, retrieve_config, model_names)
-    args_dict = {
+    args_dict: Dict[str, Union[str, List[str]]] = {
         "task": retrieve_config.task,
         "model": model_arg,
     }
@@ -142,13 +143,23 @@ def _get_args_dict(
         "context_max_tokens",
         "customized_prompt",
         "customized_answer_prefix",
-        "docs_path",
     ]
     for arg in optional_args:
         arg_value = getattr(retrieve_config, arg)
         if arg_value is not None:
             args_dict[arg] = arg_value
             args_dict[arg] = getattr(retrieve_config, arg)
+    docs_path: Union[str, List[str]] = []
+    if retrieve_config.docs_path:
+        docs_path = (
+            retrieve_config.docs_path
+            if isinstance(retrieve_config.docs_path, list)
+            else [retrieve_config.docs_path]
+        )
+        docs_path = [get_path_string(path) for path in docs_path]
+        args_dict["docs_path"] = docs_path
+    if docs_path:
+        args_dict["docs_path"] = docs_path
     non_optional_args = [
         "new_docs",
         "update_context",

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/flow/flow.py

@@ -80,19 +80,22 @@ def export_flow(
         "import os",
         "import sqlite3",
     }
-    other_imports: Set[str] = {
+    common_imports: Set[str] = {
         "from autogen import Agent",
         "from autogen import ConversableAgent",
         "from autogen import ChatResult",
         "from autogen import runtime_logging",
     }
+    local_imports: Set[str] = {
+        "from waldiez_api_keys import get_model_api_key",
+    }
     skill_imports, _ = export_skills(
         skills=all_skills,
         skill_names=skill_names,
         output_dir=output_dir,
     )
     if len(waldiez.chats) > 1:
-        other_imports.add("from autogen import initiate_chats")
+        common_imports.add("from autogen import initiate_chats")
     for agent in all_agents:
         agent_string, after_agent, agent_imports = export_agent(
             agent=agent,
@@ -103,7 +106,7 @@ def export_flow(
             all_skills=all_skills,
             group_chat_members=waldiez.flow.get_group_chat_members(agent.id),
         )
-        other_imports.update(agent_imports)
+        common_imports.update(agent_imports)
         if after_agent:
             skipped_agent_strings += after_agent
         if agent.agent_type == "manager":
@@ -123,11 +126,13 @@ def export_flow(
         all_models=all_models,
         model_names=model_names,
         notebook=notebook,
+        output_dir=output_dir,
     )
     all_imports_string = get_imports_string(
-        imports=other_imports,
+        imports=common_imports,
         builtin_imports=builtin_imports,
         skill_imports=skill_imports,
+        local_imports=local_imports,
     )
     return _combine_strings(
         waldiez=waldiez,

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/models/__init__.py

@@ -6,7 +6,8 @@ export_models
     Get the string representations of the LLM configs.
 """
 
-from typing import Dict, List
+from pathlib import Path
+from typing import Dict, List, Optional
 
 from waldiez.models import WaldiezModel
 
@@ -17,6 +18,7 @@ def export_models(
     all_models: List[WaldiezModel],
     model_names: Dict[str, str],
     notebook: bool,
+    output_dir: Optional[Path] = None,
 ) -> str:
     """Get the string representations of the LLM configs.
 
@@ -28,7 +30,8 @@ def export_models(
         A mapping of model ids to model names.
     notebook : bool
         Whether to export the string for a jupyter notebook.
-
+    output_dir : Optional[Path]
+        The output directory to write the api keys.
     Returns
     -------
     str
@@ -38,7 +41,8 @@ def export_models(
     -------
     ```python
     >>> from waldiez.models import WaldiezModel, WaldiezModelData
-    >>> model = WaldiezModel(
+    >>> api_key = "1234567890"
+    ... model = WaldiezModel(
     ...     id="wm-1",
     ...     name="llama3.1"  ,
     ...     description="A model for llamas :P.",
@@ -46,7 +50,7 @@ def export_models(
     ...     requirements=[],
     ...     data=WaldiezModelData(
     ...         base_url="https://example.com/v1",
-    ...         api_key="1234567890",
+    ...         api_key=api_key,
     ...         api_type="openai",
     ...         temperature=0.5,
     ...         price={
@@ -61,9 +65,9 @@ def export_models(
     # # Models
     llama3_1_llm_config = {
         "config_list": [{
-            "model": "llama3.1",
+            "model": "llama3_1",
             "base_url": "https://example.com/v1",
-            "api_key": "1234567890",
+            "api_key": get_model_api_key("llama3_1"),
             "api_type": "openai",
             "temperature": 0.5,
             "price": [0.0001, 0.0002],
@@ -72,26 +76,22 @@ def export_models(
     ```
     """
     content = get_comment("models", notebook) + "\n"
-    if len(all_models) == 1:
-        only_model = all_models[0]
-        model_name = model_names[only_model.id]
-        llm_config = only_model.get_llm_config()
+    for model in all_models:
+        model_name = model_names[model.id]
+        llm_config = model.get_llm_config()
+        llm_config["api_key"] = f'get_model_api_key("{model_name}")'
         model_dict_str = get_object_string(llm_config, tabs=2)
+        model_dict_str = model_dict_str.replace(
+            f'"get_model_api_key("{model_name}")"',
+            f'get_model_api_key("{model_name}")',
+        )
         content += f"{model_name}_llm_config = " + "{\n"
         content += '    "config_list": [\n'
         content += f"        {model_dict_str}\n"
         content += "    ]\n"
         content += "}\n"
-    else:
-        for model in all_models:
-            model_name = model_names[model.id]
-            llm_config = model.get_llm_config()
-            model_dict_str = get_object_string(llm_config, tabs=2)
-            content += f"{model_name}_llm_config = " + "{\n"
-            content += '    "config_list": [\n'
-            content += f"        {model_dict_str}\n"
-            content += "    ]\n"
-            content += "}\n"
+    if output_dir:
+        write_api_keys(all_models, model_names, output_dir)
     return content
 
 
@@ -191,3 +191,52 @@ def export_agent_models(
     content += "    ]\n"
     content += "}\n"
     return content
+
+
+def write_api_keys(
+    all_models: List[WaldiezModel],
+    model_names: Dict[str, str],
+    output_dir: Path,
+) -> None:
+    """Write the api keys to a separate file.
+
+    Parameters
+    ----------
+    all_models : List[WaldiezModel]
+        All the models in the flow.
+    model_names : Dict[str, str]
+        A mapping of model ids to model names.
+    output_dir : Path
+        The output directory to write the api keys.
+    """
+    # example call: llama3_1_api_key = get_model_api_key("llama3_1")
+    api_keys_content = '''
+"""API keys for the models."""
+
+__ALL_MODEL_API_KEYS__ = {
+'''
+    for model in all_models:
+        model_name = model_names[model.id]
+        api_keys_content += f'    "{model_name}": "{model.api_key}",\n'
+    api_keys_content += "}\n"
+
+    api_keys_content += '''
+
+def get_model_api_key(model_name: str) -> str:
+    """Get the api key for the model.
+
+    Parameters
+    ----------
+    model_name : str
+        The name of the model.
+
+    Returns
+    -------
+    str
+        The api key for the model.
+    """
+    return __ALL_MODEL_API_KEYS__.get(model_name, "")
+'''
+
+    with open(output_dir / "waldiez_api_keys.py", "w", encoding="utf-8") as f:
+        f.write(api_keys_content)

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/utils/__init__.py

@@ -15,12 +15,14 @@ from .naming import (
     get_valid_python_variable_name,
 )
 from .object_string import get_object_string
+from .path_check import get_path_string
 
 __all__ = [
     "add_autogen_dot_import",
     "comment",
     "get_logging_start_string",
     "get_logging_stop_string",
+    "get_path_string",
     "get_pylint_ignore_comment",
     "get_sqlite_to_csv_string",
     "get_sqlite_to_csv_call_string",

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/utils/importing.py

@@ -65,7 +65,7 @@ def get_imports_string(
     skill_imports: Set[str],
     typing_imports: Optional[Set[str]] = None,
     builtin_imports: Optional[Set[str]] = None,
-    other_imports: Optional[Set[str]] = None,
+    local_imports: Optional[Set[str]] = None,
 ) -> str:
     """Get the imports.
 
@@ -79,8 +79,8 @@ def get_imports_string(
         The typing imports, by default None.
     builtin_imports : Set[str], optional
         The builtin imports, by default None.
-    other_imports : Set[str], optional
-        Other third party imports, by default None.
+    local_imports : Set[str], optional
+        The local imports (like for getting model api keys), by default None.
 
     Returns
     -------
@@ -107,10 +107,12 @@ def get_imports_string(
         typing_imports = DEFAULT_TYPING_IMPORTS
     if not builtin_imports:
         builtin_imports = set()
-    if not other_imports:
-        other_imports = set()
+    if not local_imports:
+        local_imports = set()
     string = _get_builtin_imports_string(builtin_imports, typing_imports)
-    string += _get_third_party_imports_string(imports, other_imports)
+    string += _get_third_party_imports_string(imports)
+    if local_imports:
+        string += "\n\n" + "\n".join(sorted(local_imports)) + "\n"
     string += _get_skill_imports_string(skill_imports)
     string = "\n\n".join([line for line in string.split("\n\n") if line])
     while not string.endswith("\n\n"):
@@ -234,13 +236,9 @@ def _get_autogen_imports(
     return autogen_imports, autogen_dot_imports, remaining_imports
 
 
-def _get_third_party_imports_string(
-    imports: Set[str],
-    other_imports: Set[str],
-) -> str:
+def _get_third_party_imports_string(imports: Set[str]) -> str:
     """Get the third party imports."""
     autogen_imports, autogen_dot_imports, rest = _get_autogen_imports(imports)
-    rest.update(other_imports)
     plain_imports, from_imports_dict = _prepare_imports(
         autogen_imports=autogen_imports,
         autogen_dot_imports=autogen_dot_imports,

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/exporting/utils/object_string.py

@@ -74,6 +74,8 @@ def get_object_string(obj: Any, tabs: int = 1) -> str:
         return f"[{to_return}]"
 
     if isinstance(obj, str):
+        if obj.startswith("r'") or obj.startswith('r"'):
+            return obj
         return f'"{obj}"'
 
     if obj is None:

waldiez-0.1.3/waldiez/exporting/utils/path_check.py

@@ -0,0 +1,48 @@
+"""Path check utility functions."""
+
+import os
+from pathlib import Path
+
+# pylint: disable=broad-except
+
+
+def _is_local_path(string: str) -> bool:
+    """Check if a string is a local path.
+
+    Parameters
+    ----------
+    string : str
+        The string to check.
+
+    Returns
+    -------
+    bool
+        True if the path is a local path.
+    """
+    try:
+        path = Path(string).resolve()
+        return path.exists()
+    except Exception:  # pragma: no cover
+        return False
+
+
+def get_path_string(string: str) -> str:
+    """Get the path string.
+
+    Parameters
+    ----------
+    string : str
+        The string to check.
+
+    Returns
+    -------
+    str
+        The local path string.
+    """
+    # On windows, we get paths like "C:\path\to\file"
+    # if so, let's try to avoid invalid escape sequences
+    if not _is_local_path(string):
+        return string
+    if os.name == "nt":  # pragma: no cover
+        return f"r'{string}'"
+    return f"'{string}'"

{waldiez-0.1.1 → waldiez-0.1.3}/waldiez/models/agents/agent/agent_data.py

@@ -24,9 +24,7 @@ class WaldiezAgentData(WaldiezBase):
     human_input_mode : Literal["ALWAYS", "NEVER", "TERMINATE"]
         The human input mode to use for the agent.
     code_execution_config : Union[WaldiezAgentCodeExecutionConfig, False]
-        The code execution config. Either False (no execution) or a dict
-    max_tokens : Optional[int]
-        The maximum tokens to use. Default: None (no limit).
+        The code execution config. Either False (no execution) or a dict.
     agent_default_auto_reply : Optional[str]
         The agent's default auto reply when no input is received.
     max_consecutive_auto_reply : Optional[int]
@@ -45,7 +43,7 @@ class WaldiezAgentData(WaldiezBase):
     """
 
     model_config = ConfigDict(
-        extra="forbid",
+        extra="ignore",
         alias_generator=to_camel,
         populate_by_name=True,
         # we have a field starting with "model_" (model_ids)
@@ -71,15 +69,6 @@ class WaldiezAgentData(WaldiezBase):
             alias="humanInputMode",
         ),
     ]
-    max_tokens: Annotated[
-        Optional[int],
-        Field(
-            None,
-            title="Max tokens",
-            description="The maximum tokens to use. Default: None (no limit).",
-            alias="maxTokens",
-        ),
-    ]
     code_execution_config: Annotated[
         Union[WaldiezAgentCodeExecutionConfig, Literal[False]],
         Field(