camel-ai 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

camel/__init__.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 
-__version__ = '0.1.8'
+__version__ = '0.1.9'
 
 __all__ = [
     '__version__',

camel/configs/__init__.py

@@ -21,8 +21,10 @@ from .ollama_config import OLLAMA_API_PARAMS, OllamaConfig
 from .openai_config import OPENAI_API_PARAMS, ChatGPTConfig, OpenSourceConfig
 from .reka_config import REKA_API_PARAMS, RekaConfig
 from .samba_config import (
+    SAMBA_CLOUD_API_PARAMS,
     SAMBA_FAST_API_PARAMS,
     SAMBA_VERSE_API_PARAMS,
+    SambaCloudAPIConfig,
     SambaFastAPIConfig,
     SambaVerseAPIConfig,
 )
@@ -57,6 +59,8 @@ __all__ = [
     'SAMBA_FAST_API_PARAMS',
     'SambaVerseAPIConfig',
     'SAMBA_VERSE_API_PARAMS',
+    'SambaCloudAPIConfig',
+    'SAMBA_CLOUD_API_PARAMS',
     'TogetherAIConfig',
     'TOGETHERAI_API_PARAMS',
 ]

camel/configs/samba_config.py

@@ -13,7 +13,10 @@
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 from __future__ import annotations
 
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional, Sequence, Union
+
+from openai._types import NOT_GIVEN, NotGiven
+from pydantic import Field
 
 from camel.configs.base_config import BaseConfig
 
@@ -107,3 +110,98 @@ class SambaVerseAPIConfig(BaseConfig):
 SAMBA_VERSE_API_PARAMS = {
     param for param in SambaVerseAPIConfig().model_fields.keys()
 }
+
+
+class SambaCloudAPIConfig(BaseConfig):
+    r"""Defines the parameters for generating chat completions using the
+    OpenAI API.
+
+    Args:
+        temperature (float, optional): Sampling temperature to use, between
+            :obj:`0` and :obj:`2`. Higher values make the output more random,
+            while lower values make it more focused and deterministic.
+            (default: :obj:`0.2`)
+        top_p (float, optional): An alternative to sampling with temperature,
+            called nucleus sampling, where the model considers the results of
+            the tokens with top_p probability mass. So :obj:`0.1` means only
+            the tokens comprising the top 10% probability mass are considered.
+            (default: :obj:`1.0`)
+        n (int, optional): How many chat completion choices to generate for
+            each input message. (default: :obj:`1`)
+        response_format (object, optional): An object specifying the format
+            that the model must output. Compatible with GPT-4 Turbo and all
+            GPT-3.5 Turbo models newer than gpt-3.5-turbo-1106. Setting to
+            {"type": "json_object"} enables JSON mode, which guarantees the
+            message the model generates is valid JSON. Important: when using
+            JSON mode, you must also instruct the model to produce JSON
+            yourself via a system or user message. Without this, the model
+            may generate an unending stream of whitespace until the generation
+            reaches the token limit, resulting in a long-running and seemingly
+            "stuck" request. Also note that the message content may be
+            partially cut off if finish_reason="length", which indicates the
+            generation exceeded max_tokens or the conversation exceeded the
+            max context length.
+        stream (bool, optional): If True, partial message deltas will be sent
+            as data-only server-sent events as they become available.
+            (default: :obj:`False`)
+        stop (str or list, optional): Up to :obj:`4` sequences where the API
+            will stop generating further tokens. (default: :obj:`None`)
+        max_tokens (int, optional): The maximum number of tokens to generate
+            in the chat completion. The total length of input tokens and
+            generated tokens is limited by the model's context length.
+            (default: :obj:`None`)
+        presence_penalty (float, optional): Number between :obj:`-2.0` and
+            :obj:`2.0`. Positive values penalize new tokens based on whether
+            they appear in the text so far, increasing the model's likelihood
+            to talk about new topics. See more information about frequency and
+            presence penalties. (default: :obj:`0.0`)
+        frequency_penalty (float, optional): Number between :obj:`-2.0` and
+            :obj:`2.0`. Positive values penalize new tokens based on their
+            existing frequency in the text so far, decreasing the model's
+            likelihood to repeat the same line verbatim. See more information
+            about frequency and presence penalties. (default: :obj:`0.0`)
+        logit_bias (dict, optional): Modify the likelihood of specified tokens
+            appearing in the completion. Accepts a json object that maps tokens
+            (specified by their token ID in the tokenizer) to an associated
+            bias value from :obj:`-100` to :obj:`100`. Mathematically, the bias
+            is added to the logits generated by the model prior to sampling.
+            The exact effect will vary per model, but values between:obj:` -1`
+            and :obj:`1` should decrease or increase likelihood of selection;
+            values like :obj:`-100` or :obj:`100` should result in a ban or
+            exclusive selection of the relevant token. (default: :obj:`{}`)
+        user (str, optional): A unique identifier representing your end-user,
+            which can help OpenAI to monitor and detect abuse.
+            (default: :obj:`""`)
+        tools (list[OpenAIFunction], optional): A list of tools the model may
+            call. Currently, only functions are supported as a tool. Use this
+            to provide a list of functions the model may generate JSON inputs
+            for. A max of 128 functions are supported.
+        tool_choice (Union[dict[str, str], str], optional): Controls which (if
+            any) tool is called by the model. :obj:`"none"` means the model
+            will not call any tool and instead generates a message.
+            :obj:`"auto"` means the model can pick between generating a
+            message or calling one or more tools.  :obj:`"required"` means the
+            model must call one or more tools. Specifying a particular tool
+            via {"type": "function", "function": {"name": "my_function"}}
+            forces the model to call that tool. :obj:`"none"` is the default
+            when no tools are present. :obj:`"auto"` is the default if tools
+            are present.
+    """
+
+    temperature: float = 0.2  # openai default: 1.0
+    top_p: float = 1.0
+    n: int = 1
+    stream: bool = False
+    stop: Union[str, Sequence[str], NotGiven] = NOT_GIVEN
+    max_tokens: Union[int, NotGiven] = NOT_GIVEN
+    presence_penalty: float = 0.0
+    response_format: Union[dict, NotGiven] = NOT_GIVEN
+    frequency_penalty: float = 0.0
+    logit_bias: dict = Field(default_factory=dict)
+    user: str = ""
+    tool_choice: Optional[Union[dict[str, str], str]] = None
+
+
+SAMBA_CLOUD_API_PARAMS = {
+    param for param in SambaCloudAPIConfig().model_fields.keys()
+}

camel/models/ollama_model.py

@@ -76,10 +76,10 @@ class OllamaModel:
             )
             print(
                 f"Ollama server started on http://localhost:11434/v1 "
-                f"for {self.model_type} model"
+                f"for {self.model_type} model."
             )
         except Exception as e:
-            print(f"Failed to start Ollama server: {e}")
+            print(f"Failed to start Ollama server: {e}.")
 
     @property
     def token_counter(self) -> BaseTokenCounter:

camel/models/samba_model.py

@@ -20,7 +20,11 @@ from typing import Any, Dict, List, Optional, Union
 import httpx
 from openai import OpenAI, Stream
 
-from camel.configs import SAMBA_FAST_API_PARAMS, SAMBA_VERSE_API_PARAMS
+from camel.configs import (
+    SAMBA_CLOUD_API_PARAMS,
+    SAMBA_FAST_API_PARAMS,
+    SAMBA_VERSE_API_PARAMS,
+)
 from camel.messages import OpenAIMessage
 from camel.types import (
     ChatCompletion,
@@ -59,9 +63,10 @@ class SambaModel:
                 SambaNova service. (default: :obj:`None`)
             url (Optional[str]): The url to the SambaNova service. Current
                 support SambaNova Fast API: :obj:`"https://fast-api.snova.ai/
-                v1/chat/ completions"` and SambaVerse API: :obj:`"https://
-                sambaverse.sambanova.ai/api/predict"`. (default::obj:`"https://
-                fast-api.snova.ai/v1/chat/completions"`)
+                v1/chat/ completions"`, SambaVerse API: :obj:`"https://
+                sambaverse.sambanova.ai/api/predict"` and SambaNova Cloud:
+                :obj:`"https://api.sambanova.ai/v1"`
+                (default::obj:`"https://fast-api.snova.ai/v1/chat/completions"`)
             token_counter (Optional[BaseTokenCounter]): Token counter to use
                 for the model. If not provided, `OpenAITokenCounter(ModelType.
                 GPT_4O_MINI)` will be used.
@@ -76,6 +81,14 @@ class SambaModel:
         self.model_config_dict = model_config_dict
         self.check_model_config()
 
+        if self._url == "https://api.sambanova.ai/v1":
+            self._client = OpenAI(
+                timeout=60,
+                max_retries=3,
+                base_url=self._url,
+                api_key=self._api_key,
+            )
+
     @property
     def token_counter(self) -> BaseTokenCounter:
         r"""Initialize the token counter for the model backend.
@@ -111,6 +124,14 @@ class SambaModel:
                         "input into SambaVerse API."
                     )
 
+        elif self._url == "https://api.sambanova.ai/v1":
+            for param in self.model_config_dict:
+                if param not in SAMBA_CLOUD_API_PARAMS:
+                    raise ValueError(
+                        f"Unexpected argument `{param}` is "
+                        "input into SambaCloud API."
+                    )
+
         else:
             raise ValueError(
                 f"{self._url} is not supported, please check the url to the"
@@ -141,7 +162,7 @@ class SambaModel:
     def _run_streaming(  # type: ignore[misc]
         self, messages: List[OpenAIMessage]
     ) -> Stream[ChatCompletionChunk]:
-        r"""Handles streaming inference with SambaNova FastAPI.
+        r"""Handles streaming inference with SambaNova's API.
 
         Args:
             messages (List[OpenAIMessage]): A list of messages representing the
@@ -189,6 +210,15 @@ class SambaModel:
             except httpx.HTTPError as e:
                 raise RuntimeError(f"HTTP request failed: {e!s}")
 
+        # Handle SambaNova's Cloud API
+        elif self._url == "https://api.sambanova.ai/v1":
+            response = self._client.chat.completions.create(
+                messages=messages,
+                model=self.model_type,
+                **self.model_config_dict,
+            )
+            return response
+
         elif self._url == "https://sambaverse.sambanova.ai/api/predict":
             raise ValueError(
                 "https://sambaverse.sambanova.ai/api/predict doesn't support"
@@ -198,7 +228,7 @@ class SambaModel:
     def _run_non_streaming(
         self, messages: List[OpenAIMessage]
     ) -> ChatCompletion:
-        r"""Handles non-streaming inference with SambaNova FastAPI.
+        r"""Handles non-streaming inference with SambaNova's API.
 
         Args:
             messages (List[OpenAIMessage]): A list of messages representing the
@@ -251,6 +281,15 @@ class SambaModel:
             except json.JSONDecodeError as e:
                 raise ValueError(f"Failed to decode JSON response: {e!s}")
 
+        # Handle SambaNova's Cloud API
+        elif self._url == "https://api.sambanova.ai/v1":
+            response = self._client.chat.completions.create(
+                messages=messages,
+                model=self.model_type,
+                **self.model_config_dict,
+            )
+            return response
+
         # Handle SambaNova's Sambaverse API
         else:
             headers = {

camel/models/vllm_model.py

@@ -80,10 +80,10 @@ class VLLMModel:
             )
             print(
                 f"vllm server started on http://localhost:8000/v1 "
-                f"for {self.model_type} model"
+                f"for {self.model_type} model."
             )
         except Exception as e:
-            print(f"Failed to start vllm server: {e}")
+            print(f"Failed to start vllm server: {e}.")
 
     @property
     def token_counter(self) -> BaseTokenCounter:

camel/toolkits/google_maps_toolkit.py

@@ -13,10 +13,11 @@
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 import os
 from functools import wraps
-from typing import Any, Callable, List, Optional, Tuple, Union
+from typing import Any, Callable, List, Optional, Union
 
 from camel.toolkits.base import BaseToolkit
 from camel.toolkits.openai_function import OpenAIFunction
+from camel.utils import dependencies_required
 
 
 def handle_googlemaps_exceptions(
@@ -74,57 +75,47 @@ def handle_googlemaps_exceptions(
     return wrapper
 
 
+def _format_offset_to_natural_language(offset: int) -> str:
+    r"""Converts a time offset in seconds to a more natural language
+    description using hours as the unit, with decimal places to represent
+    minutes and seconds.
+
+    Args:
+        offset (int): The time offset in seconds. Can be positive,
+            negative, or zero.
+
+    Returns:
+        str: A string representing the offset in hours, such as
+            "+2.50 hours" or "-3.75 hours".
+    """
+    # Convert the offset to hours as a float
+    hours = offset / 3600.0
+    hours_str = f"{hours:+.2f} hour{'s' if abs(hours) != 1 else ''}"
+    return hours_str
+
+
 class GoogleMapsToolkit(BaseToolkit):
     r"""A class representing a toolkit for interacting with GoogleMaps API.
-
     This class provides methods for validating addresses, retrieving elevation,
     and fetching timezone information using the Google Maps API.
     """
 
-    def _import_googlemaps_or_raise(self) -> Any:
-        r"""Attempts to import the `googlemaps` library and returns it.
+    @dependencies_required('googlemaps')
+    def __init__(self) -> None:
+        import googlemaps
 
-        Returns:
-            module: The `googlemaps` module if successfully imported.
-
-        Raises:
-            ImportError: If the `googlemaps` library is not installed, this
-            error is raised with a message instructing how to install the
-            library using pip.
-        """
-        try:
-            import googlemaps
-
-            return googlemaps
-        except ImportError:
-            raise ImportError(
-                "Please install `googlemaps` first. You can install "
-                "it by running `pip install googlemaps`."
-            )
-
-    def _get_googlemaps_api_key(self) -> str:
-        r"""Retrieve the Google Maps API key from environment variables.
-
-        Returns:
-            str: The Google Maps API key.
-
-        Raises:
-            ValueError: If the API key is not found in the environment
-                variables.
-        """
-        # Get `GOOGLEMAPS_API_KEY` here:
-        # https://console.cloud.google.com/apis/credentials
-        GOOGLEMAPS_API_KEY = os.environ.get('GOOGLEMAPS_API_KEY')
-        if not GOOGLEMAPS_API_KEY:
+        api_key = os.environ.get('GOOGLE_API_KEY')
+        if not api_key:
             raise ValueError(
-                "`GOOGLEMAPS_API_KEY` not found in environment "
-                "variables. `GOOGLEMAPS_API_KEY` API keys are "
-                "generated in the `Credentials` page of the "
-                "`APIs & Services` tab of "
+                "`GOOGLE_API_KEY` not found in environment variables. "
+                "`GOOGLE_API_KEY` API keys are generated in the `Credentials` "
+                "page of the `APIs & Services` tab of "
                 "https://console.cloud.google.com/apis/credentials."
             )
-        return GOOGLEMAPS_API_KEY
 
+        self.gmaps = googlemaps.Client(key=api_key)
+
+    @handle_googlemaps_exceptions
     def get_address_description(
         self,
         address: Union[str, List[str]],
@@ -132,18 +123,17 @@ class GoogleMapsToolkit(BaseToolkit):
         locality: Optional[str] = None,
     ) -> str:
         r"""Validates an address via Google Maps API, returns a descriptive
-        summary.
-
-        Validates an address using Google Maps API, returning a summary that
-        includes information on address completion, formatted address, location
-        coordinates, and metadata types that are true for the given address.
+        summary. Validates an address using Google Maps API, returning a
+        summary that includes information on address completion, formatted
+        address, location coordinates, and metadata types that are true for
+        the given address.
 
         Args:
             address (Union[str, List[str]]): The address or components to
                 validate. Can be a single string or a list representing
                 different parts.
             region_code (str, optional): Country code for regional restriction,
-                helps narrowing down results. (default: :obj:`None`)
+                helps narrow down results. (default: :obj:`None`)
             locality (str, optional): Restricts validation to a specific
                 locality, e.g., "Mountain View". (default: :obj:`None`)
 
@@ -157,84 +147,69 @@ class GoogleMapsToolkit(BaseToolkit):
             ImportError: If the `googlemaps` library is not installed.
             Exception: For unexpected errors during the address validation.
         """
-        googlemaps = self._import_googlemaps_or_raise()
-        google_maps_api_key = self._get_googlemaps_api_key()
-        try:
-            gmaps = googlemaps.Client(key=google_maps_api_key)
-        except Exception as e:
-            return f"Error: {e!s}"
-
-        try:
-            addressvalidation_result = gmaps.addressvalidation(
-                [address],
-                regionCode=region_code,
-                locality=locality,
-                enableUspsCass=False,
-            )  # Always False as per requirements
-
-            # Check if the result contains an error
-            if 'error' in addressvalidation_result:
-                error_info = addressvalidation_result['error']
-                error_message = error_info.get(
-                    'message', 'An unknown error occurred'
-                )
-                error_status = error_info.get('status', 'UNKNOWN_STATUS')
-                error_code = error_info.get('code', 'UNKNOWN_CODE')
-                return (
-                    f"Address validation failed with error: {error_message} "
-                    f"Status: {error_status}, Code: {error_code}"
-                )
-
-            # Assuming the successful response structure
-            # includes a 'result' key
-            result = addressvalidation_result['result']
-            verdict = result.get('verdict', {})
-            address_info = result.get('address', {})
-            geocode = result.get('geocode', {})
-            metadata = result.get('metadata', {})
-
-            # Construct the descriptive string
-            address_complete = (
-                "Yes" if verdict.get('addressComplete', False) else "No"
-            )
-            formatted_address = address_info.get(
-                'formattedAddress', 'Not available'
+        addressvalidation_result = self.gmaps.addressvalidation(
+            [address],
+            regionCode=region_code,
+            locality=locality,
+            enableUspsCass=False,
+        )  # Always False as per requirements
+
+        # Check if the result contains an error
+        if 'error' in addressvalidation_result:
+            error_info = addressvalidation_result['error']
+            error_message = error_info.get(
+                'message', 'An unknown error occurred'
             )
-            location = geocode.get('location', {})
-            latitude = location.get('latitude', 'Not available')
-            longitude = location.get('longitude', 'Not available')
-            true_metadata_types = [
-                key for key, value in metadata.items() if value
-            ]
-            true_metadata_types_str = (
-                ', '.join(true_metadata_types)
-                if true_metadata_types
-                else 'None'
+            error_status = error_info.get('status', 'UNKNOWN_STATUS')
+            error_code = error_info.get('code', 'UNKNOWN_CODE')
+            return (
+                f"Address validation failed with error: {error_message} "
+                f"Status: {error_status}, Code: {error_code}"
             )
 
-            description = (
-                f"Address completion status: {address_complete}. "
-                f"Formatted address: {formatted_address}. "
-                f"Location (latitude, longitude): ({latitude}, {longitude}). "
-                f"Metadata indicating true types: {true_metadata_types_str}."
-            )
+        # Assuming the successful response structure
+        # includes a 'result' key
+        result = addressvalidation_result['result']
+        verdict = result.get('verdict', {})
+        address_info = result.get('address', {})
+        geocode = result.get('geocode', {})
+        metadata = result.get('metadata', {})
+
+        # Construct the descriptive string
+        address_complete = (
+            "Yes" if verdict.get('addressComplete', False) else "No"
+        )
+        formatted_address = address_info.get(
+            'formattedAddress', 'Not available'
+        )
+        location = geocode.get('location', {})
+        latitude = location.get('latitude', 'Not available')
+        longitude = location.get('longitude', 'Not available')
+        true_metadata_types = [key for key, value in metadata.items() if value]
+        true_metadata_types_str = (
+            ', '.join(true_metadata_types) if true_metadata_types else 'None'
+        )
 
-            return description
-        except Exception as e:
-            return f"An unexpected error occurred: {e!s}"
+        description = (
+            f"Address completion status: {address_complete}. "
+            f"Formatted address: {formatted_address}. "
+            f"Location (latitude, longitude): ({latitude}, {longitude}). "
+            f"Metadata indicating true types: {true_metadata_types_str}."
+        )
+
+        return description
 
     @handle_googlemaps_exceptions
-    def get_elevation(self, lat_lng: Tuple) -> str:
+    def get_elevation(self, lat: float, lng: float) -> str:
         r"""Retrieves elevation data for a given latitude and longitude.
-
         Uses the Google Maps API to fetch elevation data for the specified
         latitude and longitude. It handles exceptions gracefully and returns a
         description of the elevation, including its value in meters and the
         data resolution.
 
         Args:
-            lat_lng (Tuple[float, float]): The latitude and longitude for
-                which to retrieve elevation data.
+            lat (float): The latitude of the location to query.
+            lng (float): The longitude of the location to query.
 
         Returns:
             str: A description of the elevation at the specified location(s),
@@ -242,15 +217,8 @@ class GoogleMapsToolkit(BaseToolkit):
                 elevation data is not available, a message indicating this is
                 returned.
         """
-        googlemaps = self._import_googlemaps_or_raise()
-        google_maps_api_key = self._get_googlemaps_api_key()
-        try:
-            gmaps = googlemaps.Client(key=google_maps_api_key)
-        except Exception as e:
-            return f"Error: {e!s}"
-
         # Assuming gmaps is a configured Google Maps client instance
-        elevation_result = gmaps.elevation(lat_lng)
+        elevation_result = self.gmaps.elevation((lat, lng))
 
         # Extract the elevation data from the first
         # (and presumably only) result
@@ -273,28 +241,9 @@ class GoogleMapsToolkit(BaseToolkit):
 
         return description
 
-    def _format_offset_to_natural_language(self, offset: int) -> str:
-        r"""Converts a time offset in seconds to a more natural language
-        description using hours as the unit, with decimal places to represent
-        minutes and seconds.
-
-        Args:
-            offset (int): The time offset in seconds. Can be positive,
-                negative, or zero.
-
-        Returns:
-            str: A string representing the offset in hours, such as
-                "+2.50 hours" or "-3.75 hours".
-        """
-        # Convert the offset to hours as a float
-        hours = offset / 3600.0
-        hours_str = f"{hours:+.2f} hour{'s' if abs(hours) != 1 else ''}"
-        return hours_str
-
     @handle_googlemaps_exceptions
-    def get_timezone(self, lat_lng: Tuple) -> str:
+    def get_timezone(self, lat: float, lng: float) -> str:
         r"""Retrieves timezone information for a given latitude and longitude.
-
         This function uses the Google Maps Timezone API to fetch timezone
         data for the specified latitude and longitude. It returns a natural
         language description of the timezone, including the timezone ID, name,
@@ -302,23 +251,16 @@ class GoogleMapsToolkit(BaseToolkit):
         offset from Coordinated Universal Time (UTC).
 
         Args:
-            lat_lng (Tuple[float, float]): The latitude and longitude for
-                which to retrieve elevation data.
+            lat (float): The latitude of the location to query.
+            lng (float): The longitude of the location to query.
 
         Returns:
             str: A descriptive string of the timezone information,
-            including the timezone ID and name, standard time offset,
-            daylight saving time offset, and total offset from UTC.
+                including the timezone ID and name, standard time offset,
+                daylight saving time offset, and total offset from UTC.
         """
-        googlemaps = self._import_googlemaps_or_raise()
-        google_maps_api_key = self._get_googlemaps_api_key()
-        try:
-            gmaps = googlemaps.Client(key=google_maps_api_key)
-        except Exception as e:
-            return f"Error: {e!s}"
-
         # Get timezone information
-        timezone_dict = gmaps.timezone(lat_lng)
+        timezone_dict = self.gmaps.timezone((lat, lng))
 
         # Extract necessary information
         dst_offset = timezone_dict[
@@ -330,10 +272,10 @@ class GoogleMapsToolkit(BaseToolkit):
         timezone_id = timezone_dict['timeZoneId']
         timezone_name = timezone_dict['timeZoneName']
 
-        raw_offset_str = self._format_offset_to_natural_language(raw_offset)
-        dst_offset_str = self._format_offset_to_natural_language(dst_offset)
+        raw_offset_str = _format_offset_to_natural_language(raw_offset)
+        dst_offset_str = _format_offset_to_natural_language(dst_offset)
         total_offset_seconds = dst_offset + raw_offset
-        total_offset_str = self._format_offset_to_natural_language(
+        total_offset_str = _format_offset_to_natural_language(
             total_offset_seconds
         )
 
@@ -343,9 +285,8 @@ class GoogleMapsToolkit(BaseToolkit):
             f"The standard time offset is {raw_offset_str}. "
             f"Daylight Saving Time offset is {dst_offset_str}. "
             f"The total offset from Coordinated Universal Time (UTC) is "
-            f"{total_offset_str}, including any "
-            "Daylight Saving Time adjustment "
-            f"if applicable. "
+            f"{total_offset_str}, including any Daylight Saving Time "
+            f"adjustment if applicable. "
         )
 
         return description

camel/types/enums.py

@@ -29,6 +29,8 @@ class ModelType(Enum):
     GPT_4_TURBO = "gpt-4-turbo"
     GPT_4O = "gpt-4o"
     GPT_4O_MINI = "gpt-4o-mini"
+    O1_PREVIEW = "o1-preview"
+    O1_MINI = "o1-mini"
 
     GLM_4 = "glm-4"
     GLM_4_OPEN_SOURCE = "glm-4-open-source"
@@ -105,6 +107,8 @@ class ModelType(Enum):
             ModelType.GPT_4_TURBO,
             ModelType.GPT_4O,
             ModelType.GPT_4O_MINI,
+            ModelType.O1_PREVIEW,
+            ModelType.O1_MINI,
         }
 
     @property
@@ -270,6 +274,8 @@ class ModelType(Enum):
             ModelType.GPT_4O,
             ModelType.GPT_4O_MINI,
             ModelType.GPT_4_TURBO,
+            ModelType.O1_PREVIEW,
+            ModelType.O1_MINI,
             ModelType.MISTRAL_LARGE,
             ModelType.MISTRAL_NEMO,
             ModelType.QWEN_2,

camel/utils/token_counting.py

@@ -288,6 +288,9 @@ class OpenAITokenCounter(BaseTokenCounter):
         elif ("gpt-3.5-turbo" in self.model) or ("gpt-4" in self.model):
             self.tokens_per_message = 3
             self.tokens_per_name = 1
+        elif "o1" in self.model:
+            self.tokens_per_message = 2
+            self.tokens_per_name = 1
         else:
             # flake8: noqa :E501
             raise NotImplementedError(

{camel_ai-0.1.8.dist-info → camel_ai-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: camel-ai
-Version: 0.1.8
+Version: 0.1.9
 Summary: Communicative Agents for AI Society Study
 Home-page: https://www.camel-ai.org/
 License: Apache-2.0
@@ -56,7 +56,7 @@ Requires-Dist: neo4j (>=5.18.0,<6.0.0) ; extra == "graph-storages" or extra == "
 Requires-Dist: newspaper3k (>=0.2.8,<0.3.0) ; extra == "tools" or extra == "all"
 Requires-Dist: nltk (==3.8.1) ; extra == "tools" or extra == "all"
 Requires-Dist: numpy (>=1,<2)
-Requires-Dist: openai (>=1.2.3,<2.0.0)
+Requires-Dist: openai (>=1.45.0,<2.0.0)
 Requires-Dist: openapi-spec-validator (>=0.7.1,<0.8.0) ; extra == "tools" or extra == "all"
 Requires-Dist: opencv-python (>=4,<5) ; extra == "huggingface-agent" or extra == "all"
 Requires-Dist: pathlib (>=1.0.1,<2.0.0)
@@ -213,7 +213,7 @@ conda create --name camel python=3.10
 conda activate camel
 
 # Clone github repo
-git clone -b v0.1.8 https://github.com/camel-ai/camel.git
+git clone -b v0.1.9 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

{camel_ai-0.1.8.dist-info → camel_ai-0.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camel/__init__.py,sha256=LIlV3O5R-G_rJo3VJCy1pfsbJTHL2EOHf6G78HpJgqs,778
+camel/__init__.py,sha256=0t0atK37gcEwQ9syAnmmC8-6jJFevBMXq-PGtcDpcic,778
 camel/agents/__init__.py,sha256=SSU1wbhZXWwQnE0rRxkpyN57kEu72KklsZNcdLkXfTs,1551
 camel/agents/base.py,sha256=X39qWSiT1WnDqaJ9k3gQrTpOQSwUKzNEVpp5AY6fDH8,1130
 camel/agents/chat_agent.py,sha256=ikYGo5ahcmubb5OHNcHlehTC0adnGxCMx0iKPnyUYoU,35760
@@ -12,7 +12,7 @@ camel/agents/task_agent.py,sha256=n9xIU3QtcptRPSuHZJ4ntQ_M_a8AvJ6U9ZRV8VaxV5A,14
 camel/agents/tool_agents/__init__.py,sha256=ulTNWU2qoFGe3pvVmCq_sdfeSX3NKZ0due66TYvsL-M,862
 camel/agents/tool_agents/base.py,sha256=nQAhfWi8a_bCgzlf5-G-tmj1fKm6AjpRc89NQkWwpnc,1399
 camel/agents/tool_agents/hugging_face_tool_agent.py,sha256=1Z5tG6f_86eL0vmtRZ-BJvoLDFFLhoHt8JtDvgat1xU,8723
-camel/configs/__init__.py,sha256=GmkMkyWsCWUW_8Oc9yajTUac39Sx9iSVlnzaZFTFm_0,2231
+camel/configs/__init__.py,sha256=3SCXrA7ML8CNoOWQ1poJY6dE2e07Qxf7ACD_mdo2aJ8,2341
 camel/configs/anthropic_config.py,sha256=DGQoPyYrayhYQ7aSjkYYGHOZ5VdQ9qahtaS0p_GpU0Q,3294
 camel/configs/base_config.py,sha256=gjsDACMCk-hXDBk7qkeHcpbQrWy6jbp4iyzfqgghJEk,2485
 camel/configs/gemini_config.py,sha256=YHJSNEAIxBxPX1NAj2rWvM4OOR7vmIANH88pZO-aOsY,6880
@@ -22,7 +22,7 @@ camel/configs/mistral_config.py,sha256=G9LuY0-3S6az-8j8kpqB-4asgoaxTOsZVYeZBYJl6
 camel/configs/ollama_config.py,sha256=xrT-ulqvANjIu0bVxOzN93uaKUs8e2gW1tmYK1jULEM,4357
 camel/configs/openai_config.py,sha256=yQf7lkBcYTtCNAopow3SlZgcDMlMkiCpC5Dvhh9wb9M,7327
 camel/configs/reka_config.py,sha256=ECYg3BT7onwZX-iKLq-5TBhCFdm70rV-9hZ_G6Ye8-k,3504
-camel/configs/samba_config.py,sha256=XpNrsQjTIpEDxtGpVhr9eAU89k48jiMhF6qihWDOc0k,4577
+camel/configs/samba_config.py,sha256=U1krJSFRaFCvNCxKxgT0zlYxifviHsdkS53hr6D_Bvg,10254
 camel/configs/togetherai_config.py,sha256=WERo8W6yb-qy_3qa1GUckt58J5XGKwN5X_nC9baL8Cs,5663
 camel/configs/vllm_config.py,sha256=jfeveBnlkkBHC2RFkffG6ZlTkGzkwrX_WXMwHkg36Jg,5516
 camel/configs/zhipuai_config.py,sha256=zU8Zaj3d9d7SCFEFIkCIRNlnJw9z_oFDmIoCQKrerEM,3600
@@ -68,16 +68,16 @@ camel/models/litellm_model.py,sha256=5sTOzI07FsxDEW3jSK-XXBx91Yo8z9voahyCsK36U6U
 camel/models/mistral_model.py,sha256=39rHJ-z_6Z-UbtUqZPEAbCdFYY1Ft0Drs42jG5hHaho,9517
 camel/models/model_factory.py,sha256=_dQOx_MYxXih6uQOjkKR7uoIrhDcWRsMTKHbO3NLYN0,5974
 camel/models/nemotron_model.py,sha256=2Idf4wrZervxvfu6av42EKjefFtDnBb6cKnWCJUkqI4,2682
-camel/models/ollama_model.py,sha256=tdcKUKRo9gsa6ifvEzlE32T5eHFmi-9guKP3afwhUKs,5684
+camel/models/ollama_model.py,sha256=FSMwH2-856Zhxusm4B773xBBHdlD3UOw9OAuH5eTJTw,5686
 camel/models/open_source_model.py,sha256=p5a2sCeZl5SyrgkygClndOrHEjpJxmyhE1CqKE2fZSw,6363
 camel/models/openai_audio_models.py,sha256=_ddOxqzFZCVZaK6h33Z0THU6HXk2XlJTxVWquZ3oOaQ,10042
 camel/models/openai_compatibility_model.py,sha256=7h1zSFBgg_mQojFvtSqC54tcZOZY0NFsZ7ZNlns5CWk,4229
 camel/models/openai_model.py,sha256=uOtiLmbdH7sDKqk9oV0i1HEVni_4ApPXCukShZwQDKA,4611
 camel/models/reka_model.py,sha256=_ERZvtkK0Gd7GUx3f4VVqqtH093clVMoJfa896t9f2M,8043
-camel/models/samba_model.py,sha256=kIpk6gtwVEpXAKD8kE33TYP4o4Lm-hp6b_X7lsskcio,16385
+camel/models/samba_model.py,sha256=CgAYMIVJFAEoyCOsYS7qD_bvWhzOkvA6SD5nGBClbzE,17699
 camel/models/stub_model.py,sha256=DuqaBsS55STSbcLJsk025Uwo_u4ixrSSKqKEoZj2ihY,3680
 camel/models/togetherai_model.py,sha256=kUFGxb6cXUgkvMNQ0MsDKW27Udw622zt2QIVa3U7iLU,5461
-camel/models/vllm_model.py,sha256=YsJmgvxcsXrUGOpAVV4mrRz7T-zwywn8fBxTgNfiQ3s,5806
+camel/models/vllm_model.py,sha256=Q71tfFyfd1t81r1CxS6UT5KLadDYPgOt_cG_z6DHkWE,5808
 camel/models/zhipuai_model.py,sha256=JqJDEMk6vWH-ZnKkMwdG4yDvJWf1xk4PBsp2ifSFGR0,4939
 camel/prompts/__init__.py,sha256=O5bkcuwj2kXTkz5yDPiiMI8KN04vI8bCKG7mGE1SIdI,2326
 camel/prompts/ai_society.py,sha256=ApgvIED1Z_mdsWDNc2_u35Ktp7pEKksMrOIQKo_q5cI,6306
@@ -137,7 +137,7 @@ camel/toolkits/base.py,sha256=ez04Ei8jwIAws023bM19EGkOPUkQMouULqBvOKfM4kM,986
 camel/toolkits/code_execution.py,sha256=fWBhn1_3adiv7YYuA0gJzEBlc_dYNS6_hVtDbgB-zX0,2425
 camel/toolkits/dalle_toolkit.py,sha256=IalDFfNCz58LMRdCZNSJfLMiauHGBGN9XNRV7pzuf28,5261
 camel/toolkits/github_toolkit.py,sha256=ZauRY-kW8nx_L6igVEF62hD16j3KhqU2r49t1j6hO78,10979
-camel/toolkits/google_maps_toolkit.py,sha256=uylzlmsbjbcMwjVDPVLTLiZrUKSmGxpfukSqaJ8bM94,14343
+camel/toolkits/google_maps_toolkit.py,sha256=o81DvsOaqmpk-EUkMHlXwEoM7JOvdY8eInTsgTF8EFs,12204
 camel/toolkits/linkedin_toolkit.py,sha256=gdqj-6XnVUH-YpkZMS042t-FQ4yB1KRj3syCwjfLrnw,8004
 camel/toolkits/math_toolkit.py,sha256=r-85DHvihR87DU6n_W75pecV1P9xV3Hylfp6u-ue7T4,2521
 camel/toolkits/open_api_specs/biztoc/__init__.py,sha256=f3LXNDzN2XWWoF2D0nesG8VuEA6Zd14i2aiTDbCm5bA,708
@@ -174,13 +174,13 @@ camel/toolkits/slack_toolkit.py,sha256=JdgDJe7iExTmG7dDXOG6v5KpVjZ6_My_d_WFTYSxk
 camel/toolkits/twitter_toolkit.py,sha256=oQw8wRkU7iDxaocsmWvio4pU75pmq6FJAorPdQ2xEAE,19810
 camel/toolkits/weather_toolkit.py,sha256=n4YrUI_jTIH7oqH918IdHbXLgfQ2BPGIWWK8Jp8G1Uw,7054
 camel/types/__init__.py,sha256=ArKXATj3z_Vv4ISmROVeo6Mv3tj5kE1dTkqfgwyxVY4,1975
-camel/types/enums.py,sha256=Nx35qNmjRTwT_B6uceZ3BtwxthrRqbRRnOk558_vQUk,17458
+camel/types/enums.py,sha256=APqZIKtR2tVbUe-1JZWi7a50gjjDC7QHw9A0eKJuefA,17642
 camel/types/openai_types.py,sha256=BNQ6iCzKTjSvgcXFsAFIgrUS_YUFZBU6bDoyAp387hI,2045
 camel/utils/__init__.py,sha256=IdI9v0FetNR-nx-Hg4bmNHoYto6Xfcs_uaomksdewmo,2303
 camel/utils/async_func.py,sha256=SLo8KPkrNKdsONvFf3KBb33EgFn4gH2EKSX1aI_LKes,1578
 camel/utils/commons.py,sha256=y7eng5QF5Hkt5tuNhtEOJycTIq9hXymrUuwIS5nRad4,16481
 camel/utils/constants.py,sha256=8n4F8Y-DZy4z2F0hRvAq6f-d9SbS59kK5FyLrnJ3mkY,1360
-camel/utils/token_counting.py,sha256=G7vBzrxSXm4DzHMOfMXaOYjYf8WJTpxjHjlzmngHlYQ,21004
+camel/utils/token_counting.py,sha256=HLzpKADWxn8g9YnXaiUnIeIkbic6wkxmGJb17MT7VyI,21114
 camel/workforce/__init__.py,sha256=6jwJWDlESEqcnWCm61WCyjzFUF6KLzXA_fGI86rHfiE,878
 camel/workforce/base.py,sha256=lEHqgOV1tmsy7y4wuuKClcDkoPCRvXVdMrBngsM_6yY,1722
 camel/workforce/manager_node.py,sha256=eMmsOAoy0Wtk92b_06GhGnwKDgrTo0w-UgQorkh-az0,11529
@@ -191,6 +191,6 @@ camel/workforce/utils.py,sha256=Z-kODz5PMPtfeKKVqpcQq-b-B8oqC7XSwi_F3__Ijhs,3526
 camel/workforce/worker_node.py,sha256=wsRqk2rugCvvkcmCzvn-y-gQuyuJGAG8PIr1KtgqJFw,3878
 camel/workforce/workforce.py,sha256=SVJJgSSkYvk05RgL9oaJzHwzziH7u51KLINRuzLB8BI,1773
 camel/workforce/workforce_prompt.py,sha256=cAWYEIA0rau5itEekSoUIFttBzpKM9RzB6x-mfukGSU,4665
-camel_ai-0.1.8.dist-info/METADATA,sha256=ceVYBfVAJD9y8zBVbAMJmFC2omjmZlvftsFxVTHBtHU,24654
-camel_ai-0.1.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-camel_ai-0.1.8.dist-info/RECORD,,
+camel_ai-0.1.9.dist-info/METADATA,sha256=pHRs4KpziV_Nc7wl43oQfYqYNVVo15HdgI9XqgzC1yc,24655
+camel_ai-0.1.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+camel_ai-0.1.9.dist-info/RECORD,,