camel-ai 0.2.72a10__py3-none-any.whl → 0.2.73__py3-none-any.whl

camel/toolkits/web_deploy_toolkit.py

@@ -79,7 +79,9 @@ class WebDeployToolkit(BaseToolkit):
         self.tag_text = self._sanitize_text(tag_text)
         self.tag_url = self._validate_url(tag_url)
         self.remote_server_ip = (
-            self._validate_ip(remote_server_ip) if remote_server_ip else None
+            self._validate_ip_or_domain(remote_server_ip)
+            if remote_server_ip
+            else None
         )
         self.remote_server_port = self._validate_port(remote_server_port)
         self.server_registry_file = os.path.join(
@@ -87,24 +89,36 @@ class WebDeployToolkit(BaseToolkit):
         )
         self._load_server_registry()
 
-    def _validate_ip(self, ip: str) -> str:
-        """Validate IP address format."""
+    def _validate_ip_or_domain(self, address: str) -> str:
+        r"""Validate IP address or domain name format."""
         import ipaddress
+        import re
 
         try:
-            ipaddress.ip_address(ip)
-            return ip
+            # Try to validate as IP address first
+            ipaddress.ip_address(address)
+            return address
         except ValueError:
-            raise ValueError(f"Invalid IP address: {ip}")
+            # If not a valid IP, check if it's a valid domain name
+            domain_pattern = re.compile(
+                r'^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?'
+                r'(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$'
+            )
+            if domain_pattern.match(address) and len(address) <= 253:
+                return address
+            else:
+                raise ValueError(
+                    f"Invalid IP address or domain name: {address}"
+                )
 
     def _validate_port(self, port: int) -> int:
-        """Validate port number."""
+        r"""Validate port number."""
         if not isinstance(port, int) or port < 1 or port > 65535:
             raise ValueError(f"Invalid port number: {port}")
         return port
 
     def _sanitize_text(self, text: str) -> str:
-        """Sanitize text to prevent XSS."""
+        r"""Sanitize text to prevent XSS."""
         if not isinstance(text, str):
             return ""
         # Remove any HTML/script tags
@@ -119,7 +133,7 @@ class WebDeployToolkit(BaseToolkit):
         return text[:100]  # Limit length
 
     def _validate_url(self, url: str) -> str:
-        """Validate URL format."""
+        r"""Validate URL format."""
         if not isinstance(url, str):
             raise ValueError("URL must be a string")
         # Basic URL validation
@@ -139,7 +153,7 @@ class WebDeployToolkit(BaseToolkit):
     def _validate_subdirectory(
         self, subdirectory: Optional[str]
     ) -> Optional[str]:
-        """Validate subdirectory to prevent path traversal."""
+        r"""Validate subdirectory to prevent path traversal."""
         if subdirectory is None:
             return None
 
@@ -157,7 +171,7 @@ class WebDeployToolkit(BaseToolkit):
         return subdirectory
 
     def _is_port_available(self, port: int) -> bool:
-        """Check if a port is available for binding."""
+        r"""Check if a port is available for binding."""
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
             try:
                 sock.bind(('127.0.0.1', port))
@@ -604,7 +618,7 @@ class WebDeployToolkit(BaseToolkit):
                 return {
                     'success': False,
                     'error': (
-                        f'Port {port} is already in use by ' f'another process'
+                        f'Port {port} is already in use by another process'
                     ),
                 }
 
@@ -702,6 +716,44 @@ class WebDeployToolkit(BaseToolkit):
             # Validate subdirectory
             subdirectory = self._validate_subdirectory(subdirectory)
 
+            # Check if remote deployment is configured
+            if self.remote_server_ip:
+                return self._deploy_folder_to_remote_server(
+                    folder_path,
+                    subdirectory,
+                    domain,
+                )
+            else:
+                return self._deploy_folder_to_local_server(
+                    folder_path,
+                    port,
+                    domain,
+                    subdirectory,
+                )
+
+        except Exception as e:
+            logger.error(f"Error deploying folder: {e}")
+            return {'success': False, 'error': str(e)}
+
+    def _deploy_folder_to_local_server(
+        self,
+        folder_path: str,
+        port: int,
+        domain: Optional[str],
+        subdirectory: Optional[str],
+    ) -> Dict[str, Any]:
+        r"""Deploy folder to local server (original functionality).
+
+        Args:
+            folder_path (str): Path to the folder to deploy
+            port (int): Port to serve on
+            domain (Optional[str]): Custom domain
+            subdirectory (Optional[str]): Subdirectory path
+
+        Returns:
+            Dict[str, Any]: Deployment result
+        """
+        try:
             temp_dir = None
             if self.add_branding_tag:
                 # Create temporary directory and copy all files
@@ -877,6 +929,149 @@ class WebDeployToolkit(BaseToolkit):
             logger.error(f"Error deploying folder: {e}")
             return {'success': False, 'error': str(e)}
 
+    def _deploy_folder_to_remote_server(
+        self,
+        folder_path: str,
+        subdirectory: Optional[str] = None,
+        domain: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        r"""Deploy folder to remote server via API.
+
+        Args:
+            folder_path (str): Path to the folder to deploy
+            subdirectory (Optional[str]): Subdirectory path for deployment
+            domain (Optional[str]): Custom domain
+
+        Returns:
+            Dict[str, Any]: Deployment result
+        """
+        try:
+            import tempfile
+            import zipfile
+
+            import requests
+
+            # Validate subdirectory
+            subdirectory = self._validate_subdirectory(subdirectory)
+
+            # Create a temporary zip file of the folder
+            with tempfile.NamedTemporaryFile(
+                suffix='.zip', delete=False
+            ) as temp_zip:
+                zip_path = temp_zip.name
+
+            try:
+                # Create zip archive
+                with zipfile.ZipFile(
+                    zip_path, 'w', zipfile.ZIP_DEFLATED
+                ) as zipf:
+                    for root, _, files in os.walk(folder_path):
+                        for file in files:
+                            file_path = os.path.join(root, file)
+                            # Calculate relative path within the archive
+                            arcname = os.path.relpath(file_path, folder_path)
+                            zipf.write(file_path, arcname)
+
+                # Read zip file as base64
+                with open(zip_path, 'rb') as f:
+                    zip_data = base64.b64encode(f.read()).decode('utf-8')
+
+                # Prepare deployment data
+                deploy_data = {
+                    "deployment_type": "folder",
+                    "folder_data": zip_data,
+                    "subdirectory": subdirectory,
+                    "domain": domain,
+                    "timestamp": time.time(),
+                }
+
+                # Add logo data if custom logo is specified
+                if self.logo_path and os.path.exists(self.logo_path):
+                    try:
+                        logo_ext = os.path.splitext(self.logo_path)[1]
+                        logo_filename = f"custom_logo{logo_ext}"
+
+                        with open(self.logo_path, 'rb') as logo_file:
+                            logo_data = base64.b64encode(
+                                logo_file.read()
+                            ).decode('utf-8')
+
+                        deploy_data.update(
+                            {
+                                "logo_data": logo_data,
+                                "logo_ext": logo_ext,
+                                "logo_filename": logo_filename,
+                            }
+                        )
+                    except Exception as logo_error:
+                        logger.warning(
+                            f"Failed to process custom logo: {logo_error}"
+                        )
+
+                # Send to remote server API
+                api_url = f"http://{self.remote_server_ip}:{self.remote_server_port}/api/deploy"
+
+                response = requests.post(
+                    api_url,
+                    json=deploy_data,
+                    timeout=self.timeout
+                    or 60,  # Extended timeout for folder uploads
+                    allow_redirects=False,
+                    headers={'Content-Type': 'application/json'},
+                )
+
+                if response.status_code == 200:
+                    result = response.json()
+
+                    # Build URLs
+                    base_url = f"http://{self.remote_server_ip}:{self.remote_server_port}"
+                    deployed_url = (
+                        f"{base_url}/{subdirectory}/"
+                        if subdirectory
+                        else base_url
+                    )
+
+                    return {
+                        'success': True,
+                        'remote_url': deployed_url,
+                        'server_ip': self.remote_server_ip,
+                        'subdirectory': subdirectory,
+                        'domain': domain,
+                        'message': (
+                            f'Successfully deployed folder to remote server!\n'
+                            f'  • Access URL: {deployed_url}\n'
+                            f'  • Server: '
+                            f'{self.remote_server_ip}:{self.remote_server_port}'
+                        ),
+                        'branding_tag_added': self.add_branding_tag,
+                        'logo_processed': result.get('logo_processed', False),
+                    }
+                else:
+                    return {
+                        'success': False,
+                        'error': (
+                            f'Remote folder deployment failed: '
+                            f'HTTP {response.status_code}'
+                        ),
+                    }
+
+            finally:
+                # Clean up temporary zip file
+                if os.path.exists(zip_path):
+                    os.unlink(zip_path)
+
+        except ImportError:
+            return {
+                'success': False,
+                'error': 'Remote deployment requires requests library. '
+                'Install with: pip install requests',
+            }
+        except Exception as e:
+            return {
+                'success': False,
+                'error': f'Remote folder deployment error: {e!s}',
+            }
+
     def stop_server(self, port: int) -> Dict[str, Any]:
         r"""Stop a running server on the specified port.
 

camel/types/enums.py

@@ -245,6 +245,7 @@ class ModelType(UnifiedModelType, Enum):
     QWEN_QWQ_32B = "qwq-32b-preview"
     QWEN_QVQ_72B = "qvq-72b-preview"
     QWEN_QWQ_PLUS = "qwq-plus"
+    QWEN_3_CODER_PLUS = "qwen3-coder-plus"
 
     # Yi models (01-ai)
     YI_LIGHTNING = "yi-lightning"
@@ -763,6 +764,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.QWEN_PLUS_2025_04_28,
             ModelType.QWEN_TURBO_LATEST,
             ModelType.QWEN_TURBO_2025_04_28,
+            ModelType.QWEN_3_CODER_PLUS,
         }
 
     @property
@@ -1306,6 +1308,10 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.NOVITA_LLAMA_4_MAVERICK_17B,
         }:
             return 1_048_576
+        elif self in {
+            ModelType.QWEN_3_CODER_PLUS,
+        }:
+            return 1_000_000
         elif self in {
             ModelType.QWEN_LONG,
             ModelType.TOGETHER_LLAMA_4_SCOUT,

{camel_ai-0.2.72a10.dist-info → camel_ai-0.2.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.72a10
+Version: 0.2.73
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -69,7 +69,7 @@ Requires-Dist: jupyter-client<9,>=8.6.2; extra == 'all'
 Requires-Dist: langfuse>=2.60.5; extra == 'all'
 Requires-Dist: linkup-sdk<0.3,>=0.2.1; extra == 'all'
 Requires-Dist: litellm<2,>=1.38.1; extra == 'all'
-Requires-Dist: markitdown==0.1.1; extra == 'all'
+Requires-Dist: markitdown>=0.1.1; extra == 'all'
 Requires-Dist: math-verify<0.8,>=0.7.0; extra == 'all'
 Requires-Dist: mcp>=1.3.0; extra == 'all'
 Requires-Dist: mem0ai>=0.1.67; extra == 'all'
@@ -79,9 +79,9 @@ Requires-Dist: mypy<2,>=1.5.1; extra == 'all'
 Requires-Dist: nebula3-python==3.8.2; extra == 'all'
 Requires-Dist: neo4j<6,>=5.18.0; extra == 'all'
 Requires-Dist: networkx<4,>=3.4.2; extra == 'all'
-Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'all'
 Requires-Dist: notion-client<3,>=2.2.1; extra == 'all'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'all'
+Requires-Dist: onnxruntime<=1.19.2; extra == 'all'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'all'
 Requires-Dist: openpyxl>=3.1.5; extra == 'all'
 Requires-Dist: pandas<2,>=1.5.3; extra == 'all'
@@ -123,11 +123,12 @@ Requires-Dist: slack-bolt<2,>=1.20.1; extra == 'all'
 Requires-Dist: slack-sdk<4,>=3.27.2; extra == 'all'
 Requires-Dist: soundfile<0.14,>=0.13; extra == 'all'
 Requires-Dist: stripe<12,>=11.3.0; extra == 'all'
+Requires-Dist: surrealdb>=1.0.6; extra == 'all'
 Requires-Dist: sympy<2,>=1.13.3; extra == 'all'
 Requires-Dist: tabulate>=0.9.0; extra == 'all'
 Requires-Dist: tavily-python<0.6,>=0.5.0; extra == 'all'
 Requires-Dist: textblob<0.18,>=0.17.1; extra == 'all'
-Requires-Dist: traceroot==0.0.4a4; extra == 'all'
+Requires-Dist: traceroot==0.0.4a5; extra == 'all'
 Requires-Dist: transformers<5,>=4; extra == 'all'
 Requires-Dist: tree-sitter-python<0.24,>=0.23.6; extra == 'all'
 Requires-Dist: tree-sitter<0.24,>=0.23.2; extra == 'all'
@@ -140,6 +141,7 @@ Requires-Dist: types-setuptools<70,>=69.2.0; extra == 'all'
 Requires-Dist: types-tqdm<5,>=4.66.0; extra == 'all'
 Requires-Dist: unstructured==0.16.20; extra == 'all'
 Requires-Dist: weaviate-client>=4.15.0; extra == 'all'
+Requires-Dist: websockets<15.1,>=13.0; extra == 'all'
 Requires-Dist: wikipedia<2,>=1; extra == 'all'
 Requires-Dist: wolframalpha<6,>=5.0.0; extra == 'all'
 Requires-Dist: xls2xlsx>=0.2.0; extra == 'all'
@@ -191,7 +193,7 @@ Requires-Dist: ipykernel<7,>=6.0.0; extra == 'dev-tools'
 Requires-Dist: jupyter-client<9,>=8.6.2; extra == 'dev-tools'
 Requires-Dist: langfuse>=2.60.5; extra == 'dev-tools'
 Requires-Dist: mcp>=1.3.0; extra == 'dev-tools'
-Requires-Dist: traceroot==0.0.4a4; extra == 'dev-tools'
+Requires-Dist: traceroot==0.0.4a5; extra == 'dev-tools'
 Requires-Dist: tree-sitter-python<0.24,>=0.23.6; extra == 'dev-tools'
 Requires-Dist: tree-sitter<0.24,>=0.23.2; extra == 'dev-tools'
 Requires-Dist: typer>=0.15.2; extra == 'dev-tools'
@@ -208,8 +210,9 @@ Requires-Dist: chunkr-ai>=0.0.50; extra == 'document-tools'
 Requires-Dist: crawl4ai>=0.3.745; extra == 'document-tools'
 Requires-Dist: docx2txt<0.9,>=0.8; extra == 'document-tools'
 Requires-Dist: docx>=0.2.4; extra == 'document-tools'
-Requires-Dist: markitdown==0.1.1; extra == 'document-tools'
+Requires-Dist: markitdown>=0.1.1; extra == 'document-tools'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'document-tools'
+Requires-Dist: onnxruntime<=1.19.2; extra == 'document-tools'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'document-tools'
 Requires-Dist: openpyxl>=3.1.5; extra == 'document-tools'
 Requires-Dist: pandasai<3,>=2.3.0; extra == 'document-tools'
@@ -221,6 +224,41 @@ Requires-Dist: reportlab>=4.4.2; extra == 'document-tools'
 Requires-Dist: tabulate>=0.9.0; extra == 'document-tools'
 Requires-Dist: unstructured==0.16.20; extra == 'document-tools'
 Requires-Dist: xls2xlsx>=0.2.0; extra == 'document-tools'
+Provides-Extra: eigent
+Requires-Dist: aci-sdk>=1.0.0b1; extra == 'eigent'
+Requires-Dist: anthropic<0.50.0,>=0.47.0; extra == 'eigent'
+Requires-Dist: chunkr-ai>=0.0.41; extra == 'eigent'
+Requires-Dist: chunkr-ai>=0.0.50; extra == 'eigent'
+Requires-Dist: crawl4ai>=0.3.745; extra == 'eigent'
+Requires-Dist: datasets<4,>=3; extra == 'eigent'
+Requires-Dist: docx>=0.2.4; extra == 'eigent'
+Requires-Dist: duckduckgo-search<7,>=6.3.5; extra == 'eigent'
+Requires-Dist: exa-py<2,>=1.10.0; extra == 'eigent'
+Requires-Dist: ffmpeg-python<0.3,>=0.2.0; extra == 'eigent'
+Requires-Dist: html2text>=2024.2.26; extra == 'eigent'
+Requires-Dist: imageio[pyav]<3,>=2.34.2; extra == 'eigent'
+Requires-Dist: markitdown>=0.1.1; extra == 'eigent'
+Requires-Dist: mcp-server-fetch==2025.1.17; extra == 'eigent'
+Requires-Dist: mcp-simple-arxiv==0.2.2; extra == 'eigent'
+Requires-Dist: numpy<=2.2,>=1.2; extra == 'eigent'
+Requires-Dist: onnxruntime<=1.19.2; extra == 'eigent'
+Requires-Dist: openpyxl>=3.1.5; extra == 'eigent'
+Requires-Dist: pandas<2,>=1.5.3; extra == 'eigent'
+Requires-Dist: playwright>=1.50.0; extra == 'eigent'
+Requires-Dist: pyautogui<0.10,>=0.9.54; extra == 'eigent'
+Requires-Dist: pydub<0.26,>=0.25.1; extra == 'eigent'
+Requires-Dist: pylatex>=1.4.2; extra == 'eigent'
+Requires-Dist: pytesseract>=0.3.13; extra == 'eigent'
+Requires-Dist: python-dotenv<2,>=1.0.0; extra == 'eigent'
+Requires-Dist: python-pptx>=1.0.2; extra == 'eigent'
+Requires-Dist: reportlab>=4.4.2; extra == 'eigent'
+Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'eigent'
+Requires-Dist: scenedetect>=0.6.5.2; extra == 'eigent'
+Requires-Dist: tabulate>=0.9.0; extra == 'eigent'
+Requires-Dist: websockets<15.1,>=13.0; extra == 'eigent'
+Requires-Dist: wikipedia<2,>=1; extra == 'eigent'
+Requires-Dist: xls2xlsx>=0.2.0; extra == 'eigent'
+Requires-Dist: yt-dlp<2025,>=2024.11.4; extra == 'eigent'
 Provides-Extra: huggingface
 Requires-Dist: datasets<4,>=3; extra == 'huggingface'
 Requires-Dist: diffusers<0.26,>=0.25.0; extra == 'huggingface'
@@ -259,11 +297,11 @@ Requires-Dist: exa-py<2,>=1.10.0; extra == 'owl'
 Requires-Dist: ffmpeg-python<0.3,>=0.2.0; extra == 'owl'
 Requires-Dist: html2text>=2024.2.26; extra == 'owl'
 Requires-Dist: imageio[pyav]<3,>=2.34.2; extra == 'owl'
-Requires-Dist: markitdown==0.1.1; extra == 'owl'
+Requires-Dist: markitdown>=0.1.1; extra == 'owl'
 Requires-Dist: mcp-server-fetch==2025.1.17; extra == 'owl'
 Requires-Dist: mcp-simple-arxiv==0.2.2; extra == 'owl'
-Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'owl'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'owl'
+Requires-Dist: onnxruntime<=1.19.2; extra == 'owl'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'owl'
 Requires-Dist: openpyxl>=3.1.5; extra == 'owl'
 Requires-Dist: pandas<2,>=1.5.3; extra == 'owl'
@@ -290,6 +328,7 @@ Requires-Dist: tree-sitter-python<0.24,>=0.23.6; extra == 'owl'
 Requires-Dist: tree-sitter<0.24,>=0.23.2; extra == 'owl'
 Requires-Dist: typer>=0.15.2; extra == 'owl'
 Requires-Dist: unstructured==0.16.20; extra == 'owl'
+Requires-Dist: websockets<15.1,>=13.0; extra == 'owl'
 Requires-Dist: wikipedia<2,>=1; extra == 'owl'
 Requires-Dist: xls2xlsx>=0.2.0; extra == 'owl'
 Requires-Dist: yt-dlp<2025,>=2024.11.4; extra == 'owl'
@@ -331,6 +370,7 @@ Requires-Dist: pyobvector>=0.1.18; extra == 'storage'
 Requires-Dist: pytidb-experimental==0.0.1.dev4; extra == 'storage'
 Requires-Dist: qdrant-client<2,>=1.9.0; extra == 'storage'
 Requires-Dist: redis<6,>=5.0.6; extra == 'storage'
+Requires-Dist: surrealdb>=1.0.6; extra == 'storage'
 Requires-Dist: weaviate-client>=4.15.0; extra == 'storage'
 Provides-Extra: web-tools
 Requires-Dist: apify-client<2,>=1.8.1; extra == 'web-tools'
@@ -346,13 +386,13 @@ Requires-Dist: google-auth-oauthlib==1.2.1; extra == 'web-tools'
 Requires-Dist: googlemaps<5,>=4.10.0; extra == 'web-tools'
 Requires-Dist: html2text>=2024.2.26; extra == 'web-tools'
 Requires-Dist: linkup-sdk<0.3,>=0.2.1; extra == 'web-tools'
-Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'web-tools'
 Requires-Dist: playwright>=1.50.0; extra == 'web-tools'
 Requires-Dist: pyowm<4,>=3.3.0; extra == 'web-tools'
 Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'web-tools'
 Requires-Dist: scrapegraph-py<2,>=1.12.0; extra == 'web-tools'
 Requires-Dist: sympy<2,>=1.13.3; extra == 'web-tools'
 Requires-Dist: tavily-python<0.6,>=0.5.0; extra == 'web-tools'
+Requires-Dist: websockets<15.1,>=13.0; extra == 'web-tools'
 Requires-Dist: wikipedia<2,>=1; extra == 'web-tools'
 Requires-Dist: wolframalpha<6,>=5.0.0; extra == 'web-tools'
 Description-Content-Type: text/markdown