waldiez 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

waldiez/_version.py

@@ -2,4 +2,4 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Version information for Waldiez."""
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"

waldiez/exporting/agent/utils/captain_agent.py

@@ -142,10 +142,11 @@ def get_llm_config(
     max_tokens: Optional[int] = 2048
     if agent.data.model_ids:
         waldiez_model = get_waldiez_model(agent.data.model_ids[0], all_models)
-        model_name = waldiez_model.name
-        temperature = waldiez_model.data.temperature
-        top_p = waldiez_model.data.top_p
-        max_tokens = waldiez_model.data.max_tokens
+        llm_config = waldiez_model.get_llm_config(skip_price=True)
+        for key in ["temperature", "top_p", "max_tokens"]:
+            if key not in llm_config:
+                llm_config[key] = None
+        return llm_config
     config_dict = {
         "model": model_name,
         "temperature": temperature,

waldiez/exporting/flow/flow_exporter.py

@@ -213,7 +213,7 @@ class FlowExporter(BaseExporter, ExporterMixin):
         content += imports[0] + "\n"
         content += get_np_no_nep50_handle() + "\n"
         content += self.get_comment("logging", self.for_notebook) + "\n"
-        content += get_start_logging(tabs=0) + "\n"
+        content += get_start_logging(is_async=is_async, tabs=0) + "\n"
         content += "start_logging()\n\n"
         if models_output:
             content += self.get_comment("models", self.for_notebook) + "\n"

waldiez/exporting/flow/utils/importing_utils.py

@@ -127,7 +127,6 @@ def get_the_imports_string(
             "\nimport anyio"
             "\nimport nest_asyncio"
             "\nfrom aiocsv import AsyncDictWriter"
-            "\nfrom asyncer import asyncify"
         )
     if got_import_autogen:
         final_string += "\nimport autogen  # type: ignore\n"

waldiez/exporting/flow/utils/logging_utils.py

@@ -16,11 +16,13 @@ get_sqlite_to_csv_call_string
 """
 
 
-def get_start_logging(tabs: int = 0) -> str:
+def get_start_logging(is_async: bool, tabs: int = 0) -> str:
     """Get the logging start call string.
 
     Parameters
     ----------
+    is_async : bool
+        Whether to use async mode.
     tabs : int, optional
         The number of tabs to use for indentation, by default 0
 
@@ -41,7 +43,8 @@ def get_start_logging(tabs: int = 0) -> str:
         )
     """
     tab = "    " * tabs
-    content = f'''
+    if is_async is False:
+        return f'''
 {tab}def start_logging() -> None:
 {tab}    """Start logging."""
 {tab}    runtime_logging.start(
@@ -49,7 +52,20 @@ def get_start_logging(tabs: int = 0) -> str:
 {tab}        config={{"dbname": "flow.db"}},
 {tab}    )
 '''
-    return content
+    return f'''
+{tab}def start_logging() -> None:
+{tab}    """Start logging."""
+{tab}    # pylint: disable=import-outside-toplevel
+{tab}    from anyio.from_thread import start_blocking_portal
+
+{tab}    with start_blocking_portal(backend="asyncio") as portal:
+{tab}        portal.call(
+{tab}            runtime_logging.start,
+{tab}            None,
+{tab}            "sqlite",
+{tab}            {{"dbname": "flow.db"}},
+{tab}        )
+'''
 
 
 # pylint: disable=differing-param-doc,differing-type-doc
@@ -336,6 +352,11 @@ def get_stop_logging(tabs: int, is_async: bool) -> str:
         content += "async "
     content += "def stop_logging() -> None:\n"
     content += '    """Stop logging."""\n'
-    content += f"{tab}    runtime_logging.stop()\n"
+    if is_async:
+        content += f"{tab}    # pylint: disable=import-outside-toplevel\n"
+        content += f"{tab}    from asyncer import asyncify\n\n"
+        content += f"{tab}    await asyncify(runtime_logging.stop)()\n"
+    else:
+        content += f"{tab}    runtime_logging.stop()\n"
     content += get_sqlite_out_call(tabs + 1, is_async)
     return content

waldiez/models/model/__init__.py

@@ -3,12 +3,13 @@
 """Waldiez model."""
 
 from .extra_requirements import get_models_extra_requirements
-from .model import DEFAULT_BASE_URLS, WaldiezModel
+from .model import DEFAULT_BASE_URLS, MODEL_NEEDS_BASE_URL, WaldiezModel
 from .model_data import WaldiezModelAPIType, WaldiezModelData, WaldiezModelPrice
 
 __all__ = [
     "get_models_extra_requirements",
     "DEFAULT_BASE_URLS",
+    "MODEL_NEEDS_BASE_URL",
     "WaldiezModel",
     "WaldiezModelData",
     "WaldiezModelPrice",

waldiez/models/model/model.py

@@ -23,6 +23,22 @@ DEFAULT_BASE_URLS: Dict[WaldiezModelAPIType, str] = {
 }
 
 
+# we can omit the base_url for these models
+MODEL_NEEDS_BASE_URL: Dict[WaldiezModelAPIType, bool] = {
+    "openai": False,
+    "azure": False,
+    "google": False,
+    "anthropic": False,
+    "cohere": False,
+    "other": False,  # falls back to openai
+    "deepseek": True,
+    "mistral": True,
+    "groq": True,
+    "together": True,
+    "nim": True,
+}
+
+
 class WaldiezModel(WaldiezBase):
     """Waldiez Model class.
 
@@ -225,10 +241,13 @@ def set_default_base_url(
     Dict[str, Any]
         The llm config dictionary with the default base url set.
     """
-    if api_type in ("openai", "other", "azure", "cohere"):
-        return llm_config
+    dict_copy = llm_config.copy()
     if "base_url" not in llm_config or not llm_config["base_url"]:
-        dict_copy = llm_config.copy()
-        dict_copy["base_url"] = DEFAULT_BASE_URLS.get(api_type, "")
-        return dict_copy
-    return llm_config
+        if MODEL_NEEDS_BASE_URL.get(api_type, True):
+            dict_copy["base_url"] = DEFAULT_BASE_URLS.get(api_type, "")
+    if (
+        not llm_config.get("base_url", "")
+        and MODEL_NEEDS_BASE_URL.get(api_type, True) is False
+    ):
+        dict_copy.pop("base_url", None)
+    return dict_copy

{waldiez-0.4.0.dist-info → waldiez-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.4.0
+Version: 0.4.1
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/python
 Project-URL: repository, https://github.com/waldiez/python.git
@@ -90,12 +90,12 @@ Requires-Dist: mkdocs-material==9.6.4; extra == 'docs'
 Requires-Dist: mkdocs-minify-html-plugin==0.2.4; extra == 'docs'
 Requires-Dist: mkdocs==1.6.1; extra == 'docs'
 Requires-Dist: mkdocstrings-python==1.15.0; extra == 'docs'
-Requires-Dist: mkdocstrings[crystal,python]==0.28.0; extra == 'docs'
+Requires-Dist: mkdocstrings[crystal,python]==0.28.1; extra == 'docs'
 Provides-Extra: jupyter
 Requires-Dist: jupyterlab>=4.3.0; extra == 'jupyter'
-Requires-Dist: waldiez-jupyter==0.4.0; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.4.1; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.4.0; extra == 'studio'
+Requires-Dist: waldiez-studio==0.4.1; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio==0.25.3; extra == 'test'
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'

{waldiez-0.4.0.dist-info → waldiez-0.4.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 waldiez/__init__.py,sha256=cXWdy5P9i_x6fHwlL5DRaIhmpfnhabo5GjASStlcLWw,819
 waldiez/__main__.py,sha256=0dYzNrQbovRwQQvmZC6_1FDR1m71SUIOkTleO5tBnBw,203
-waldiez/_version.py,sha256=kKOFfvxa6VJYqFJTYlWnFWHOdlAHJD4A0wscEAebzAU,155
+waldiez/_version.py,sha256=VHh_I0xQTv4ulSgfDjPM_C5DVb9vuauW9XaxjICO6dc,155
 waldiez/cli.py,sha256=FaPWh9IHBHoC9rtyt2bKBrk7S018BX__mwtTArfv4AA,6992
 waldiez/exporter.py,sha256=ZuMF8cra0Shw4nkDiFuPqaQKFYrF0vPj_I3EhPyesPw,4788
 waldiez/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,7 +9,7 @@ waldiez/exporting/__init__.py,sha256=nlMWBnn_MViGBJmDhrTCYpPv19fEP_WixvmmY9jt5c8
 waldiez/exporting/agent/__init__.py,sha256=GOgri16QNICpx3YNZPzVn_KYVxuQACYKQyazhJNtYK0,188
 waldiez/exporting/agent/agent_exporter.py,sha256=Rv-Fcsf3r_nEib1HVk3SglKkLU6fN7cMLgUwJ4Vi4sw,10482
 waldiez/exporting/agent/utils/__init__.py,sha256=UlyOZCm3jLz5PHOJ9fhZuCqbNBBlomzvRd7K_tKR-No,844
-waldiez/exporting/agent/utils/captain_agent.py,sha256=31KfNOQpaZIcS97-G9yzC7du7bYrU7SWXkNor9twlX4,7233
+waldiez/exporting/agent/utils/captain_agent.py,sha256=TJZbjf7TtIdS00wTWciqneoNrGC4aJiYL2Rn6WpxMLs,7277
 waldiez/exporting/agent/utils/code_execution.py,sha256=sRHczOmm12U9E-Q1v9UQRwao1LUEve4fnKvJwsokNNk,2352
 waldiez/exporting/agent/utils/group_manager.py,sha256=VCqd-lsCertwVTWVez9Z1HS_H-UmBGyNGizvC736VnI,7360
 waldiez/exporting/agent/utils/reasoning.py,sha256=EBE42Dar9n6fBrhg9D9wch0KptsP_m3Dm2WNEDuKb7g,999
@@ -43,15 +43,15 @@ waldiez/exporting/chats/utils/sequential.py,sha256=TYAte2hwpGkEENjCMer-6PcL2r8PE
 waldiez/exporting/chats/utils/single_chat.py,sha256=FYz0jvtO0yFYPk5CBuXb7rOW8VxB0NJWvWY1PEHPIAQ,9535
 waldiez/exporting/chats/utils/swarm.py,sha256=i8n-QNSgAOGHGMcV1pwbEVqb_LJZtNxtJ4yR42yLl6I,6928
 waldiez/exporting/flow/__init__.py,sha256=TAJ8lq9saP1IX0U-A6yGKCfvbQnEocmRAX4Hc60f3yY,183
-waldiez/exporting/flow/flow_exporter.py,sha256=xXLf5hx5xYwnPgv1iTAa6x1RtdMBno3jGQACxgtYfVM,18196
+waldiez/exporting/flow/flow_exporter.py,sha256=Lt4FC8cyRiEVcRpYr_sCLeE1MijNFV2LQGvNxJLGQCs,18215
 waldiez/exporting/flow/utils/__init__.py,sha256=Alk9M4_BLvnZ5yO3y0T-Xie__OgtjCPtjzfZx_tH0Ig,1380
 waldiez/exporting/flow/utils/agent_utils.py,sha256=QL1nzlgYeh6Y-l9R3hmCsrxSzluvBVciuuEIFdBXXKM,6109
 waldiez/exporting/flow/utils/chat_utils.py,sha256=q6HS4JTNQJe15eh78H1BlN-wId9XzvVQziGhxsUIEFs,1882
 waldiez/exporting/flow/utils/def_main.py,sha256=GxEBfX6cUGFCMdxiu_hp5TLIhIC4ohczxA1A01mHnOo,2746
 waldiez/exporting/flow/utils/flow_content.py,sha256=w2JUqx1EmYRnptGtsYrU-gfETHi6bkimV9vd2Ao-YBI,5548
 waldiez/exporting/flow/utils/flow_names.py,sha256=GtfVRF8WYUP8Xx47AiyZ5FuuCUb22jhJn3diblbbBfM,3463
-waldiez/exporting/flow/utils/importing_utils.py,sha256=juKDzk06A4IuHrjFjR-TUnc8AcH0-6b4S_2_rt5MuFs,7151
-waldiez/exporting/flow/utils/logging_utils.py,sha256=m3Ja00Qb_07rLVgwSOFSBaJk48SfCNsyPuQbRy5VMNU,10963
+waldiez/exporting/flow/utils/importing_utils.py,sha256=ysryaFF872wrtqRDAlZB2mFvXwjmkX_PG-j5vLPViWQ,7106
+waldiez/exporting/flow/utils/logging_utils.py,sha256=DsBuv7LLWb4i18HQkXrJV2YpjG_Jzk0ZDsM-8HJ5bMg,11720
 waldiez/exporting/models/__init__.py,sha256=QbyYuS-Px-M9vMrdL-UKqnDzhYWRkNmRGBbc1IBuwpM,212
 waldiez/exporting/models/models_exporter.py,sha256=i9aSnL7JNU8iWJotfSxWbm1CRjUP6yqd9CtfXWiRbV4,6289
 waldiez/exporting/models/utils.py,sha256=g15N_JA21Ly5nzCfburEbHf6fTWX7hG5rxyTvAwyXl0,4997
@@ -119,9 +119,9 @@ waldiez/models/flow/__init__.py,sha256=3UFbMMn_5c5AXs6ppkvhNeWb9jelru2lNHUjpEq0N
 waldiez/models/flow/flow.py,sha256=Shyg-XwzloSzqLLFPwY9g_MjZHxAGy2h_qfPmK58UZs,16876
 waldiez/models/flow/flow_data.py,sha256=afD97Ff9Yd7QSXE4DphaENY7wqrq4QIl4EVgI8O4ZFk,5464
 waldiez/models/flow/utils.py,sha256=X_jelP5lHuQt1OZE6sxLlhEKbkkt8jZgbkF79e9rQig,7140
-waldiez/models/model/__init__.py,sha256=0klSsHb8poHgtnVdCi-rDiSOb_yOofk9RPehjLQnGFc,482
+waldiez/models/model/__init__.py,sha256=jyJHJWzqNxnmDHAhpXWMnMK_4VF2olPIE3k7KV7_xVg,532
 waldiez/models/model/extra_requirements.py,sha256=KgqzixbsvzM6Ec8rdQEVoWtyNusqW33ukdRoBHS5LAg,1690
-waldiez/models/model/model.py,sha256=wYT_ajxIYY-wxJPRiZctAs78nazdUYkYSlCVw3ZE4Go,7283
+waldiez/models/model/model.py,sha256=A1N90QZsbd3vEddeffAMdKIja9RjspZl46Ff4q2CP9w,7743
 waldiez/models/model/model_data.py,sha256=5bdUz0gi3RNowVh4SCKiTds6sZMMBvf69pNO6mx4LnA,3793
 waldiez/models/skill/__init__.py,sha256=EMkjfsMUU-2H5cZ4NhzHJWuyaSp605whT-zf7Gxt4aA,470
 waldiez/models/skill/extra_requirements.py,sha256=q3ZY5v6mWQ_9C0GuAmFm8DK2j8TDr9CQafTmFY0w5bc,1082
@@ -139,9 +139,9 @@ waldiez/utils/pysqlite3_checker.py,sha256=8m0yBAbg3tMyXOBktL2q1WXMgjym_Ttn2NbgpL
 waldiez/utils/cli_extras/__init__.py,sha256=FQ6biuz6Ig-U3xkmgac3WMUynH_7XWjeGI-DqWFTC8c,625
 waldiez/utils/cli_extras/jupyter.py,sha256=C4fOiS_PbU15X-6HUZBPHvfgEjOrY39e07mClKvswPI,2971
 waldiez/utils/cli_extras/studio.py,sha256=te6VmwYDeEEK6Jps-Ou84QPZmCYMsF-oE1hNu6ewFHg,887
-waldiez-0.4.0.dist-info/METADATA,sha256=MikezMp_G1SZ7l8ObfJ5OqbzsoKyZNRffqR4s3ZQN7o,9830
-waldiez-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-waldiez-0.4.0.dist-info/entry_points.txt,sha256=9MQ8Y1rD19CU7UwjNPwoyTRpQsPs2QimjrtwTD0bD6k,44
-waldiez-0.4.0.dist-info/licenses/LICENSE,sha256=bWinEG_ynCS8eSj1vhAmYDWwYODhBOF0AUEjOgZ3kmU,11355
-waldiez-0.4.0.dist-info/licenses/NOTICE.md,sha256=lrKsUNrpE18LPSLPJY_kt2ZJFZJEwH55wPv5Axcheyc,133
-waldiez-0.4.0.dist-info/RECORD,,
+waldiez-0.4.1.dist-info/METADATA,sha256=K25AqCDPJc5CMWseNYv8QrLGtKA4jcuBRDqKWpnRpDA,9830
+waldiez-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+waldiez-0.4.1.dist-info/entry_points.txt,sha256=9MQ8Y1rD19CU7UwjNPwoyTRpQsPs2QimjrtwTD0bD6k,44
+waldiez-0.4.1.dist-info/licenses/LICENSE,sha256=bWinEG_ynCS8eSj1vhAmYDWwYODhBOF0AUEjOgZ3kmU,11355
+waldiez-0.4.1.dist-info/licenses/NOTICE.md,sha256=lrKsUNrpE18LPSLPJY_kt2ZJFZJEwH55wPv5Axcheyc,133
+waldiez-0.4.1.dist-info/RECORD,,