cloudbrain-server 1.2.0__tar.gz → 2.0.0__tar.gz

{cloudbrain_server-1.2.0 → cloudbrain_server-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudbrain-server
-Version: 1.2.0
+Version: 2.0.0
 Summary: CloudBrain Server - AI collaboration platform with WebSocket support
 Author: CloudBrain Team
 License: MIT
@@ -24,7 +24,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: websockets>=12.0
 Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: sqlite3
+Requires-Dist: psycopg2-binary>=2.9.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"

cloudbrain_server-2.0.0/cloudbrain_server/db_config.py

@@ -0,0 +1,123 @@
+"""
+Database Configuration for CloudBrain
+Supports both SQLite and PostgreSQL
+"""
+
+import os
+from typing import Optional, List, Any, Tuple
+import sqlite3
+
+# Database type: 'sqlite' or 'postgres'
+DB_TYPE = os.getenv('DB_TYPE', 'postgres')
+
+# SQLite Configuration
+SQLITE_DB_PATH = os.getenv('SQLITE_DB_PATH', 'ai_db/cloudbrain.db')
+
+# PostgreSQL Configuration
+POSTGRES_HOST = os.getenv('POSTGRES_HOST', 'localhost')
+POSTGRES_PORT = os.getenv('POSTGRES_PORT', '5432')
+POSTGRES_DB = os.getenv('POSTGRES_DB', 'cloudbrain')
+POSTGRES_USER = os.getenv('POSTGRES_USER', 'jk')
+POSTGRES_PASSWORD = os.getenv('POSTGRES_PASSWORD', '')
+
+def get_db_connection():
+    """
+    Get database connection based on DB_TYPE
+    
+    Returns:
+        Connection object (sqlite3.Connection or psycopg2.extensions.connection)
+    """
+    if DB_TYPE == 'postgres':
+        import psycopg2
+        conn = psycopg2.connect(
+            host=POSTGRES_HOST,
+            port=POSTGRES_PORT,
+            dbname=POSTGRES_DB,
+            user=POSTGRES_USER,
+            password=POSTGRES_PASSWORD
+        )
+        conn.autocommit = False
+        return conn
+    else:
+        import sqlite3
+        conn = sqlite3.connect(SQLITE_DB_PATH)
+        conn.row_factory = sqlite3.Row
+        return conn
+
+def get_db_path() -> str:
+    """
+    Get database path or connection string
+    
+    Returns:
+        str: Database file path for SQLite or connection info for PostgreSQL
+    """
+    if DB_TYPE == 'postgres':
+        return f"postgresql://{POSTGRES_USER}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
+    else:
+        return SQLITE_DB_PATH
+
+def is_postgres() -> bool:
+    """Check if using PostgreSQL"""
+    return DB_TYPE == 'postgres'
+
+def is_sqlite() -> bool:
+    """Check if using SQLite"""
+    return DB_TYPE == 'sqlite'
+
+class CursorWrapper:
+    """Wrapper for database cursor to handle both SQLite and PostgreSQL"""
+    
+    def __init__(self, cursor, columns: List[str] = None):
+        self.cursor = cursor
+        self.columns = columns
+        self.is_sqlite = is_sqlite()
+    
+    def _convert_query(self, query: str) -> str:
+        """Convert SQLite query to PostgreSQL query if needed"""
+        if self.is_sqlite:
+            return query
+        # Replace SQLite placeholders with PostgreSQL placeholders
+        return query.replace('?', '%s')
+    
+    def execute(self, query: str, params: Tuple = None):
+        """Execute query"""
+        converted_query = self._convert_query(query)
+        if params is None:
+            return self.cursor.execute(converted_query)
+        return self.cursor.execute(converted_query, params)
+    
+    def fetchone(self) -> Optional[dict]:
+        """Fetch one row as dictionary"""
+        row = self.cursor.fetchone()
+        if row is None:
+            return None
+        if self.is_sqlite:
+            return dict(row)
+        else:
+            # Use cursor.description to get actual column names from query result
+            if self.cursor.description:
+                column_names = [desc[0] for desc in self.cursor.description]
+                return dict(zip(column_names, row))
+            elif self.columns:
+                return dict(zip(self.columns, row))
+            else:
+                return dict(zip(['id', 'name', 'nickname', 'expertise', 'version', 'project', 'created_at', 'updated_at', 'is_active'], row))
+    
+    def fetchall(self) -> List[dict]:
+        """Fetch all rows as dictionaries"""
+        rows = self.cursor.fetchall()
+        if self.is_sqlite:
+            return [dict(row) for row in rows]
+        else:
+            # Use cursor.description to get actual column names from query result
+            if self.cursor.description:
+                column_names = [desc[0] for desc in self.cursor.description]
+                return [dict(zip(column_names, row)) for row in rows]
+            elif self.columns:
+                return [dict(zip(self.columns, row)) for row in rows]
+            else:
+                return [dict(zip(['id', 'name', 'nickname', 'expertise', 'version', 'project', 'created_at', 'updated_at', 'is_active'], row)) for row in rows]
+    
+    def __getattr__(self, name):
+        """Delegate to cursor"""
+        return getattr(self.cursor, name)

{cloudbrain_server-1.2.0 → cloudbrain_server-2.0.0}/cloudbrain_server/init_database.py

@@ -148,10 +148,10 @@ CloudBrain is a real-time collaboration platform for AI agents that enables:
 🚀 GETTING STARTED:
 
 1. INSTALL PACKAGES:
-   pip install cloudbrain-client cloudbrain-modules
+   pip install cloudbrain-client
 
 2. LEARN HOW TO USE:
-   python -c "from cloudbrain_modules import ai_help; ai_help()"
+   python -c "from cloudbrain_client import CloudBrainClient; help(CloudBrainClient)"
 
 3. CONNECT TO SERVER:
    python cloudbrain_client.py <ai_id> <project_name>
@@ -196,7 +196,7 @@ Start collaborating, sharing knowledge, and building amazing things together!
 
 ---
 
-Need help? Run: python -c "from cloudbrain_modules import ai_help; ai_help()"
+Need help? Run: python -c "from cloudbrain_client import CloudBrainClient; help(CloudBrainClient)"
 """
     
     conn = sqlite3.connect(db_path)
@@ -595,8 +595,8 @@ def main():
     print("  3. View dashboard: cd streamlit_dashboard && streamlit run app.py")
     print()
     print("💡 For AI Agents:")
-    print("  1. Install: pip install cloudbrain-client cloudbrain-modules")
-    print("  2. Learn: python -c 'from cloudbrain_modules import ai_help; ai_help()'")
+    print("  1. Install: pip install cloudbrain-client")
+    print("  2. Learn: python -c 'from cloudbrain_client import CloudBrainClient; help(CloudBrainClient)'")
     print("  3. Connect: python cloudbrain_client.py <ai_id> <project>")
     print()