waldiez 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

waldiez/_version.py

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

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/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/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/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/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(

{waldiez-0.1.1.dist-info → waldiez-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.1
+Version: 0.1.2
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/py/
 Project-URL: repository, https://github.com/waldiez/py.git

{waldiez-0.1.1.dist-info → waldiez-0.1.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 waldiez/__init__.py,sha256=pX6lHj8fNlfqCpHEfF6MNQBCR6qRjFYjwBSOCoxrlwk,313
 waldiez/__main__.py,sha256=9xR-F2ohZcRPDG6KrM7cJpXciKX-u6WdL221ckyJ04k,112
-waldiez/_version.py,sha256=NaHCBZ_FA_IeC0AG1CRQOBiDXIjN52ox7DFAhwpRyd0,62
+waldiez/_version.py,sha256=hiO5XGIMf-JKIDO7TZrWy6g1Iq-nh3n_W-WL3Cll4ZM,62
 waldiez/cli.py,sha256=vIQDqs9XBOlDpshq7rNgvoTcnnkeZrsXa_51gMWs6H4,4690
 waldiez/exporter.py,sha256=iKe-l_Me8NRWsXHIdBcrOrnLT9XIyp4iYi4HLuuj2jA,9342
 waldiez/io_stream.py,sha256=YczhIw0PKEsxCSY6tAqElCqOUh8b-aEkSIGC1JjXxAs,5877
@@ -20,7 +20,7 @@ waldiez/exporting/agents/rag_user/chroma_utils.py,sha256=jBncfPsepTzgSo9wxyeLFEV
 waldiez/exporting/agents/rag_user/mongo_utils.py,sha256=y5IL-Anfktg9cYo2o-ED1A7lwHQWdVMWD_W1AT5_RmE,2664
 waldiez/exporting/agents/rag_user/pgvector_utils.py,sha256=EyGDwvo1Pe8bqoJl3NFpqK6zizN81lPPaSMBMQF79Dc,2722
 waldiez/exporting/agents/rag_user/qdrant_utils.py,sha256=tn1A7pjQjJfGS33ALgnPYTz7xu8rVBidcc5-WHLq8e8,3487
-waldiez/exporting/agents/rag_user/rag_user.py,sha256=omBmT6mQR2fSMo003GVckqUpAaI6mWRpVRqCqFpKJRg,5294
+waldiez/exporting/agents/rag_user/rag_user.py,sha256=l2RcQ2Ni5EerLk23js_aq70EKA-jZzDzTWsL8WhU5hY,5824
 waldiez/exporting/agents/rag_user/vector_db.py,sha256=64Gr_y1VTZLXi1pC4KjChsZ6DTX7cxdkDRQI3Ty_H-U,3659
 waldiez/exporting/chats/__init__.py,sha256=v5aR1gWqSN5xeDDMIFo-ceC_Z9UgL8qJZofC2sU8HqQ,296
 waldiez/exporting/chats/chats.py,sha256=xI5ZzWpcqYz8Kuu7B9pU6iHN16wUwHxOvYFhH5vxWuA,1259
@@ -31,20 +31,21 @@ waldiez/exporting/flow/def_main.py,sha256=YpdhqO4iFng3r7if69ZPMJAibPVNDqnrOrWvGw
 waldiez/exporting/flow/flow.py,sha256=AGISfMOicdee4zikvuega8ZnHceQpdfCphDBgIE5_94,6038
 waldiez/exporting/models/__init__.py,sha256=qJvP0CIrgLPM2pnIoXM26eyUdh7ub-CiNNLJwXEOAwQ,5829
 waldiez/exporting/skills/__init__.py,sha256=oIA9f5ABtYSbS0kMY_4ovU3-m6meVk5blEu_xViZsRU,3536
-waldiez/exporting/utils/__init__.py,sha256=omS2U9OpXTaIezT-RdktZK6lWJsFNGUsic4digBfQNg,955
+waldiez/exporting/utils/__init__.py,sha256=tP1V4g9-MyARlfOEL_1YWMJNW7UivUrrukq7DIwdq6k,1018
 waldiez/exporting/utils/comments.py,sha256=X9j8w48rh3DfFDjiMverU9DBSuE9yuMMbbStxBbN1sE,3190
 waldiez/exporting/utils/importing.py,sha256=M7vBcW9gPe3hCaTX2Bsv-mz36DAiCe4R-3mLrMWGY-Y,8616
 waldiez/exporting/utils/logging_utils.py,sha256=uoV6O23lfB5ztOYEZiYu8Mn-2xEUwp_Qx404Mr62i7M,5822
 waldiez/exporting/utils/method_utils.py,sha256=7-RUMTylNM2W0iM1bPX2_Gn3553XZSl2s2VGEijxNp4,891
 waldiez/exporting/utils/naming.py,sha256=VdoVODQduhXIs9hQFWUVEVqTaSyNDt7rkECsuIgXYwI,3196
-waldiez/exporting/utils/object_string.py,sha256=FQYrP2UmpRY6S-koCSCigaquyqGq42c62szcS2joy24,2086
+waldiez/exporting/utils/object_string.py,sha256=2kdIu4in3iUV92a2KbLWwp9POhvY-fzF_r2AGVnCKls,2166
+waldiez/exporting/utils/path_check.py,sha256=laGSLLiiwIIKxpAp5JIbtEvurbvXGkT4Hx0lemJcA9s,976
 waldiez/models/__init__.py,sha256=IMq8vzuAgmv92kHSSuZQLF38vVd31ojgOHonuHqWYj0,2888
 waldiez/models/waldiez.py,sha256=B_ujtMVnuGFAB_d9gMDydOdbe2XtP80EH7FVefwpHeg,8909
 waldiez/models/agents/__init__.py,sha256=3ZyVYBHMFzZjRMIdPrBF6HLg82LPAlEubL6utL6KhfU,1856
 waldiez/models/agents/agents.py,sha256=zIqihnoBjzaQLL_P6FcVoHddcusRNYsWPIFLZD091bE,3641
 waldiez/models/agents/agent/__init__.py,sha256=inA0zV3dnwmcQlcObH_FLaZSURjFG31E_XUampJAnJU,746
 waldiez/models/agents/agent/agent.py,sha256=DAwreQtIdoM2x_vVccIkALl5whyS07GvfKRUxdVhLeY,5513
-waldiez/models/agents/agent/agent_data.py,sha256=JJcSZqT4YRFn3lSxE1U5q_fp8bv-Y2KVeUWa1nb-gA4,5343
+waldiez/models/agents/agent/agent_data.py,sha256=A3qIvOKyUKBIqqPbsBKVE5JTNQ8JcoDEGMqazNkN_rA,5009
 waldiez/models/agents/agent/code_execution.py,sha256=kgL3pbEEyuMvJid0sIbfe4os7SWKpzL1Bv4O525Biyk,1942
 waldiez/models/agents/agent/linked_skill.py,sha256=8RHWHkHXqFuv7lEe1PuQoK1hTO3kBQ7ILKm9kCEWqNs,667
 waldiez/models/agents/agent/nested_chat.py,sha256=DAF3TCbTwyDvg6PGbeETtBLCQ4Xz5Saw5a4Xi-jr6jA,1929
@@ -87,8 +88,8 @@ waldiez/stream/__init__.py,sha256=6qst5j2iXmV-wDTnhgCna3llqUfJ6tkR0HBq7Vx9x-Q,19
 waldiez/stream/consumer.py,sha256=VQDJEomYpGjmAtOoFBJrpCyoYzwykJUIOrdiLn08Uj4,4049
 waldiez/stream/provider.py,sha256=JqnnR1yAimfK4HxW4gr4HIoJ15Ly71kXn75mv7FZBmw,9478
 waldiez/stream/server.py,sha256=Ya4AKP5Wr_xAsbG3Q-qShqHmfIyamj9LGXizJsL-N4Y,11815
-waldiez-0.1.1.dist-info/METADATA,sha256=ryA8mM8Qtx9n9EigDrJspBcjMCOXr6waWvYeJktw1b4,6745
-waldiez-0.1.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-waldiez-0.1.1.dist-info/entry_points.txt,sha256=5Po4yQXPa_QEdtTevpEBgr3rGoIvDMeQuJR2zqwBLBo,45
-waldiez-0.1.1.dist-info/licenses/LICENSE,sha256=VQEHM6WMQLRu1qaGl3GWsoOknDwro-69eGo4NLIJPIM,1064
-waldiez-0.1.1.dist-info/RECORD,,
+waldiez-0.1.2.dist-info/METADATA,sha256=CoM_iWzFesJK4x_hhyAojVpt9joTUZMFiwRyxRoemoE,6745
+waldiez-0.1.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+waldiez-0.1.2.dist-info/entry_points.txt,sha256=5Po4yQXPa_QEdtTevpEBgr3rGoIvDMeQuJR2zqwBLBo,45
+waldiez-0.1.2.dist-info/licenses/LICENSE,sha256=VQEHM6WMQLRu1qaGl3GWsoOknDwro-69eGo4NLIJPIM,1064
+waldiez-0.1.2.dist-info/RECORD,,