camel-ai 0.2.76a5__py3-none-any.whl → 0.2.76a6__py3-none-any.whl

camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.76a5'
+__version__ = '0.2.76a6'
 
 __all__ = [
     '__version__',

camel/models/azure_openai_model.py

@@ -247,9 +247,6 @@ class AzureOpenAIModel(BaseModelBackend):
         )
         is_streaming = self.model_config_dict.get("stream", False)
         if response_format:
-            result: Union[ChatCompletion, Stream[ChatCompletionChunk]] = (
-                self._request_parse(messages, response_format, tools)
-            )
             if is_streaming:
                 return self._request_stream_parse(
                     messages, response_format, tools
@@ -308,9 +305,6 @@ class AzureOpenAIModel(BaseModelBackend):
         )
         is_streaming = self.model_config_dict.get("stream", False)
         if response_format:
-            result: Union[
-                ChatCompletion, AsyncStream[ChatCompletionChunk]
-            ] = await self._arequest_parse(messages, response_format, tools)
             if is_streaming:
                 return await self._arequest_stream_parse(
                     messages, response_format, tools

camel/models/openai_compatible_model.py

@@ -190,9 +190,6 @@ class OpenAICompatibleModel(BaseModelBackend):
         is_streaming = self.model_config_dict.get("stream", False)
 
         if response_format:
-            result: Union[ChatCompletion, Stream[ChatCompletionChunk]] = (
-                self._request_parse(messages, response_format, tools)
-            )
             if is_streaming:
                 # Use streaming parse for structured output
                 return self._request_stream_parse(
@@ -256,9 +253,6 @@ class OpenAICompatibleModel(BaseModelBackend):
         is_streaming = self.model_config_dict.get("stream", False)
 
         if response_format:
-            result: Union[
-                ChatCompletion, AsyncStream[ChatCompletionChunk]
-            ] = await self._arequest_parse(messages, response_format, tools)
             if is_streaming:
                 # Use streaming parse for structured output
                 return await self._arequest_stream_parse(

camel/models/zhipuai_model.py

@@ -13,16 +13,26 @@
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 
 import os
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, List, Optional, Type, Union
+
+from pydantic import BaseModel
 
 from camel.configs import ZhipuAIConfig
+from camel.logger import get_logger
+from camel.messages import OpenAIMessage
+from camel.models._utils import try_modify_message_with_format
 from camel.models.openai_compatible_model import OpenAICompatibleModel
-from camel.types import ModelType
+from camel.types import (
+    ChatCompletion,
+    ModelType,
+)
 from camel.utils import (
     BaseTokenCounter,
     api_keys_required,
 )
 
+logger = get_logger(__name__)
+
 
 class ZhipuAIModel(OpenAICompatibleModel):
     r"""ZhipuAI API in a unified OpenAICompatibleModel interface.
@@ -85,3 +95,52 @@ class ZhipuAIModel(OpenAICompatibleModel):
             max_retries=max_retries,
             **kwargs,
         )
+
+    def _request_parse(
+        self,
+        messages: List[OpenAIMessage],
+        response_format: Type[BaseModel],
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> ChatCompletion:
+        import copy
+
+        request_config = copy.deepcopy(self.model_config_dict)
+        request_config.pop("stream", None)
+        if tools is not None:
+            request_config["tools"] = tools
+
+        try_modify_message_with_format(messages[-1], response_format)
+        request_config["response_format"] = {"type": "json_object"}
+        try:
+            return self._client.beta.chat.completions.parse(
+                messages=messages,
+                model=self.model_type,
+                **request_config,
+            )
+        except Exception as e:
+            logger.error(f"Fallback attempt also failed: {e}")
+            raise
+
+    async def _arequest_parse(
+        self,
+        messages: List[OpenAIMessage],
+        response_format: Type[BaseModel],
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> ChatCompletion:
+        import copy
+
+        request_config = copy.deepcopy(self.model_config_dict)
+        request_config.pop("stream", None)
+        if tools is not None:
+            request_config["tools"] = tools
+        try_modify_message_with_format(messages[-1], response_format)
+        request_config["response_format"] = {"type": "json_object"}
+        try:
+            return await self._async_client.beta.chat.completions.parse(
+                messages=messages,
+                model=self.model_type,
+                **request_config,
+            )
+        except Exception as e:
+            logger.error(f"Fallback attempt also failed: {e}")
+            raise

camel/toolkits/terminal_toolkit/terminal_toolkit.py

@@ -15,6 +15,7 @@ import atexit
 import os
 import platform
 import select
+import shlex
 import subprocess
 import sys
 import threading
@@ -191,6 +192,20 @@ class TerminalToolkit(BaseToolkit):
                     f"Successfully attached to Docker container "
                     f"'{docker_container_name}'."
                 )
+                # Ensure the working directory exists inside the container
+                if self.docker_workdir:
+                    try:
+                        quoted_dir = shlex.quote(self.docker_workdir)
+                        mkdir_cmd = f'sh -lc "mkdir -p -- {quoted_dir}"'
+                        _init = self.docker_api_client.exec_create(
+                            self.container.id, mkdir_cmd
+                        )
+                        self.docker_api_client.exec_start(_init['Id'])
+                    except Exception as e:
+                        logger.warning(
+                            f"[Docker] Failed to ensure workdir "
+                            f"'{self.docker_workdir}': {e}"
+                        )
             except NotFound:
                 raise RuntimeError(
                     f"Docker container '{docker_container_name}' not found."

{camel_ai-0.2.76a5.dist-info → camel_ai-0.2.76a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.76a5
+Version: 0.2.76a6
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel

{camel_ai-0.2.76a5.dist-info → camel_ai-0.2.76a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camel/__init__.py,sha256=bLjZcDc8DRcI8wLV7I8kDKAWyprqmSHok9iECoiqX2I,901
+camel/__init__.py,sha256=q3b2abfCj3uAj7Lc_RfTP2ckw3bMdzWeJKFIakJdNsI,901
 camel/generators.py,sha256=JRqj9_m1PF4qT6UtybzTQ-KBT9MJQt18OAAYvQ_fr2o,13844
 camel/human.py,sha256=Xg8x1cS5KK4bQ1SDByiHZnzsRpvRP-KZViNvmu38xo4,5475
 camel/logger.py,sha256=WgEwael_eT6D-lVAKHpKIpwXSTjvLbny5jbV1Ab8lnA,5760
@@ -182,7 +182,7 @@ camel/models/aiml_model.py,sha256=jmkQlqA7NkDXn2xN-98wtanI2KHbcMWQwNPjc38wyLI,35
 camel/models/amd_model.py,sha256=4LMjbRH-ghCdTapK9nhbgkOs9ZKLxQ9FXEg1esgmNZM,4124
 camel/models/anthropic_model.py,sha256=GlerIhIc7uGhzIsQoZw-_8CGOdcZT8DC_95V3hx3q-4,8350
 camel/models/aws_bedrock_model.py,sha256=0JdsLxfi-coI8LtSPNewsaeR43CwC0qG2Gm_iY-ZCdo,4073
-camel/models/azure_openai_model.py,sha256=MSjb5E3b6BHQg896P-Mj00Q0xPq0ibi0tO2T87Fj25s,17802
+camel/models/azure_openai_model.py,sha256=gQVSYuOR9ECv4UKiph_zM7QmLQ2FLqJ5MQAqLkPN2FQ,17474
 camel/models/base_audio_model.py,sha256=_VUWh1L3rh8mldNvM5R6jBOKtvmTeBKJyRxAdPJmPlY,3324
 camel/models/base_model.py,sha256=aty9oIZowjt5Mxi0aB7ifHUmQO-78UMfUFLPNm10lGg,20164
 camel/models/cohere_model.py,sha256=9H2F8bjwxPgwSwgPPRoOy090dQKBboQxnlk-94FoDIk,16719
@@ -207,7 +207,7 @@ camel/models/novita_model.py,sha256=9rmiAShSQOIxTzdhxZaI7Xw1ZQkYeQ-yiL1VmIWqsWc,
 camel/models/nvidia_model.py,sha256=C26XCUQRe2O7ySGIqTihySovDHRk19WN0GOsSHupYQE,3510
 camel/models/ollama_model.py,sha256=pz8mvrCw6dv4Kqfqrg89ZFI_4Y_ppRhvPXVcnkxYGlk,4198
 camel/models/openai_audio_models.py,sha256=BSixkXlc8xirQLl2qCla-g6_y9wDLnMZVHukHrhzw98,13344
-camel/models/openai_compatible_model.py,sha256=6racVSQlKeB4-0sHdDdkc_XEhPLBoij0kgdQcxEmQq4,16865
+camel/models/openai_compatible_model.py,sha256=K-AqO3YulF1S5_Y4lmMS_kE26LnK6gm2zVDZiPNszj0,16537
 camel/models/openai_model.py,sha256=Y2vV4UlGk1yBx3q-JSmISO9kfausvqv-tH4awRBHR9E,19454
 camel/models/openrouter_model.py,sha256=V1DKBPoYJ6oCDDBqNK0RrK2JWq4oOWlbo3qu0lT4CbA,3514
 camel/models/ppio_model.py,sha256=G559Seb4KLU4FlYgSQ2UD_A6xOacX0eL6DrE_Hhmpv0,3645
@@ -223,7 +223,7 @@ camel/models/vllm_model.py,sha256=PwotGvmYo0zNsY5WVfd1R8IgCt2oQHO7ccmnlqVyDCs,42
 camel/models/volcano_model.py,sha256=joWFRGbsEpHFzRYRF7nv91mVADe-Y77NozEhfCnevSo,3375
 camel/models/watsonx_model.py,sha256=24sN5vrniwNI2mPjcByyF4tArFiwqo1FnyRQ1L5yPbE,10876
 camel/models/yi_model.py,sha256=exlJCQkUu2_Gx7qDwo3yBf6RrL6h8yMFRFMq6AXLwew,3506
-camel/models/zhipuai_model.py,sha256=k8Xu4Y7JvGhBUApbf3BxMnIQ0K-xLyM4DvYWrHpjoQY,3573
+camel/models/zhipuai_model.py,sha256=Og2eYOnpDlhE1U5njadRbJkxmN83XiRMTYIxN8mgr7M,5529
 camel/models/reward/__init__.py,sha256=MqPN6wXh7Y1SoeNoFlYaMG6xHzLG0CYsv_3kB2atIQk,984
 camel/models/reward/base_reward_model.py,sha256=erCmBCl51oFNjEHCXWxdHKIPNVJnQlNGgYBDn2bFD-Q,2064
 camel/models/reward/evaluator.py,sha256=54ev5MuQ_5Tp0-LGO59EIuIkGrVMbtXXqpBR5Ps9kCM,2426
@@ -452,7 +452,7 @@ camel/toolkits/open_api_specs/web_scraper/openapi.yaml,sha256=u_WalQ01e8W1D27VnZ
 camel/toolkits/open_api_specs/web_scraper/paths/__init__.py,sha256=OKCZrQCDwaWtXIN_2rA9FSqEvgpQRieRoHh7Ek6N16A,702
 camel/toolkits/open_api_specs/web_scraper/paths/scraper.py,sha256=aWy1_ppV4NVVEZfnbN3tu9XA9yAPAC9bRStJ5JuXMRU,1117
 camel/toolkits/terminal_toolkit/__init__.py,sha256=yE66haKm-NwoNJwtnCmcRpANtWxQB_dZoD8O5iqXt_Y,786
-camel/toolkits/terminal_toolkit/terminal_toolkit.py,sha256=SggWswQgkZqlogQgT3Nuu92f1WC-DOwNJUNJzLgUZKQ,36031
+camel/toolkits/terminal_toolkit/terminal_toolkit.py,sha256=Mp7C41d_T3guUNU7iXXOFKLNopTUyNGckzQ0JDCQ9og,36784
 camel/toolkits/terminal_toolkit/utils.py,sha256=N0Dz5EEoJRfkP_LEVXepP5XQB57z8Hqt30Xt6SkGgOg,19221
 camel/types/__init__.py,sha256=EOmWlqS7aE5cB51_Vv7vHUexKeBbx9FSsfynl5vKjwo,2565
 camel/types/enums.py,sha256=nnI2St4xY57T90ges9MAzuB75geAwo-kRcspGMssZkE,70287
@@ -485,7 +485,7 @@ camel/verifiers/math_verifier.py,sha256=tA1D4S0sm8nsWISevxSN0hvSVtIUpqmJhzqfbuMo
 camel/verifiers/models.py,sha256=GdxYPr7UxNrR1577yW4kyroRcLGfd-H1GXgv8potDWU,2471
 camel/verifiers/physics_verifier.py,sha256=c1grrRddcrVN7szkxhv2QirwY9viIRSITWeWFF5HmLs,30187
 camel/verifiers/python_verifier.py,sha256=ogTz77wODfEcDN4tMVtiSkRQyoiZbHPY2fKybn59lHw,20558
-camel_ai-0.2.76a5.dist-info/METADATA,sha256=xBAZFX8-q4cL4Z4F9EMSyn4Mjumcw0HYhEm2Y1AENDM,55432
-camel_ai-0.2.76a5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-camel_ai-0.2.76a5.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
-camel_ai-0.2.76a5.dist-info/RECORD,,
+camel_ai-0.2.76a6.dist-info/METADATA,sha256=2_ySY5FlyudCStDAMBurKcM-VXSgL6OrwWMApda6o2k,55432
+camel_ai-0.2.76a6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+camel_ai-0.2.76a6.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
+camel_ai-0.2.76a6.dist-info/RECORD,,