camel-ai 0.2.73a3__py3-none-any.whl → 0.2.73a4__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_ai-0.2.73a3.dist-info → camel_ai-0.2.73a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.73a3
+Version: 0.2.73a4
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -124,6 +124,7 @@ 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'
@@ -336,6 +337,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'

{camel_ai-0.2.73a3.dist-info → camel_ai-0.2.73a4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camel/__init__.py,sha256=LY1yvi28uSSDg8ifjgLeFiCqzATMOyd5fXqDmkOmEAo,901
+camel/__init__.py,sha256=1A_s4813pCXFzfgs6rYH4XAW07sXn8m93RQ8jiUaKvQ,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
@@ -299,7 +299,7 @@ camel/storages/object_storages/amazon_s3.py,sha256=9Yvyyyb1LGHxr8REEza7oGopbVtLE
 camel/storages/object_storages/azure_blob.py,sha256=66dHcvjE2ZNdb339oBU6LbFiKzPYrnlb4tQ_3m2Yazc,5992
 camel/storages/object_storages/base.py,sha256=pImWylYJm7Wt8q87lBE1Cxk26IJ9sRtXq_OJmV6bJlg,3796
 camel/storages/object_storages/google_cloud.py,sha256=59AvGar_GDoGYHhzUi5KBtInv2KaUVnw8SalsL43410,5332
-camel/storages/vectordb_storages/__init__.py,sha256=RSVrBZrCHFhjhil0AKhNpH-eiNd2RmxazpnhAtpbhOc,1434
+camel/storages/vectordb_storages/__init__.py,sha256=Nztyo6ZvEYJ7yWz6Id4ImCpTvGaMTM0v8wFM2dMjOBg,1470
 camel/storages/vectordb_storages/base.py,sha256=EP_WbEtI3SJPHro9rjNkIq9UDUP1AAHmxZgeya94Lgk,6738
 camel/storages/vectordb_storages/chroma.py,sha256=wXuLUYsgkC2VvdyLrlL5VqEDVzJDBUo7OdimK8hBLmg,27553
 camel/storages/vectordb_storages/faiss.py,sha256=MHE3db9kJmVuu0aScXsSo8p60TCtc2Ot0rO77zcPgt8,26760
@@ -307,7 +307,7 @@ camel/storages/vectordb_storages/milvus.py,sha256=ChQyEuaXCWCKxytLN2z4QrkEthx2xE
 camel/storages/vectordb_storages/oceanbase.py,sha256=eNBelw4D6r3OWlhHzGJ8Xw-ej9nU1uTZ6CYoXdbxDkI,17054
 camel/storages/vectordb_storages/pgvector.py,sha256=p-5RGCVT46zP-Yop85thWi2m0ZnHILSJFpu2A-7qWnk,12438
 camel/storages/vectordb_storages/qdrant.py,sha256=a_cT0buSCHQ2CPZy852-mdvMDwy5zodCvAKMaa4zIvg,18017
-camel/storages/vectordb_storages/surreal.py,sha256=QFg-Ogoo_pT8KkzZH0BmZpLCd5wQTfkuDD1A0zodq5s,15465
+camel/storages/vectordb_storages/surreal.py,sha256=vPUh3iFz73kiDFP_FLDzq3ULaFGQGAcJDkOh9Y8SKps,13392
 camel/storages/vectordb_storages/tidb.py,sha256=w83bxgKgso43MtHqlpf2EMSpn1_Nz6ZZtY4fPw_-vgs,11192
 camel/storages/vectordb_storages/weaviate.py,sha256=wDUE4KvfmOl3DqHFU4uF0VKbHu-q9vKhZDe8FZ6QXsk,27888
 camel/tasks/__init__.py,sha256=MuHwkw5GRQc8NOCzj8tjtBrr2Xg9KrcKp-ed_-2ZGIM,906
@@ -384,7 +384,7 @@ camel/toolkits/twitter_toolkit.py,sha256=Px4N8aUxUzy01LhGSWkdrC2JgwKkrY3cvxgMeJ2
 camel/toolkits/video_analysis_toolkit.py,sha256=h6D7b1MAAzaHn222n_YKtwG-EGEGgMt7mBrNNVipYZc,23361
 camel/toolkits/video_download_toolkit.py,sha256=0dOzsG9vpCHr31bW4Iiqz4iMkQ7uxkAyTMgiculvenk,7567
 camel/toolkits/weather_toolkit.py,sha256=fs9x9aC38Wsvni6A4PPpbRX6-aBnZiqs2Jix39yoULU,7413
-camel/toolkits/web_deploy_toolkit.py,sha256=8dhbYmx5opmimDRdXwEU7LPeG8Z17TWUEURbEneyIPg,38847
+camel/toolkits/web_deploy_toolkit.py,sha256=jUiU8ur759Q0Aiw5TUcvhu7Iv10W36Y1RS0hEHZIb4U,46154
 camel/toolkits/whatsapp_toolkit.py,sha256=udUQXkXyeWsmrUlOJZsGBhHtc_jhB05Axe_TchhibsU,5760
 camel/toolkits/wolfram_alpha_toolkit.py,sha256=qeIM8ySn5ilcExBWtx-hDOc35bNcebLVnZ67kt1H3mQ,9295
 camel/toolkits/zapier_toolkit.py,sha256=A83y1UcfuopH7Fx82pORzypl1StbhBjB2HhyOqYa300,7124
@@ -408,7 +408,7 @@ camel/toolkits/hybrid_browser_toolkit_py/actions.py,sha256=x6X-kEdQx3K1ID-BBwdQE
 camel/toolkits/hybrid_browser_toolkit_py/agent.py,sha256=0ifwhYUDJ5GLxfdpC5KquPaW1a0QBAutp2Y9y0YFujw,11685
 camel/toolkits/hybrid_browser_toolkit_py/browser_session.py,sha256=fgV1o4pWOQ_fUvmpk7UHYcJCqHY_cmivoY_OB0ZKv3s,26866
 camel/toolkits/hybrid_browser_toolkit_py/config_loader.py,sha256=0zpDq3aFKEva2jc38kgLHnyxypIDk9SOcMjoP26tozo,15414
-camel/toolkits/hybrid_browser_toolkit_py/hybrid_browser_toolkit.py,sha256=nph9Nyam4349zPPA6f2NZ7KPA-xNLW18qHqooBeVlFM,76798
+camel/toolkits/hybrid_browser_toolkit_py/hybrid_browser_toolkit.py,sha256=z-v49Su2XTWCERJuv2AR3GeJHpv5Iad2fa3tenz40eQ,80190
 camel/toolkits/hybrid_browser_toolkit_py/snapshot.py,sha256=3vQaFK5C1P8WnkK2eDMaFOizrZf4uUAW0LxdeoF4F2w,8539
 camel/toolkits/hybrid_browser_toolkit_py/stealth_script.js,sha256=z4XRSVUpAS87Sj36s3bY8XXhvRcHBlgsUOyMxV2HI80,27650
 camel/toolkits/hybrid_browser_toolkit_py/unified_analyzer.js,sha256=VnzIn0KcEtxuncJi-OPZzdWbLSeSHCH-7sviFAGNM8g,40823
@@ -467,7 +467,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.73a3.dist-info/METADATA,sha256=vy-EgY3IPDzVVc5UNfT7MQvrWqvpBZ1ZUPGQb-bXOrA,50334
-camel_ai-0.2.73a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-camel_ai-0.2.73a3.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
-camel_ai-0.2.73a3.dist-info/RECORD,,
+camel_ai-0.2.73a4.dist-info/METADATA,sha256=eiu76i0Cyxv90DdcFdRBgWHY9ZlXP54ule0zp0VSsiA,50434
+camel_ai-0.2.73a4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+camel_ai-0.2.73a4.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
+camel_ai-0.2.73a4.dist-info/RECORD,,