youclaw 4.6.11__tar.gz → 4.7.1__tar.gz

{youclaw-4.6.11/src/youclaw.egg-info → youclaw-4.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: youclaw
-Version: 4.6.11
+Version: 4.7.1
 Summary: Your Personal AI Assistant - Universal Neural Core
 Author-email: Imran <imran@example.com>
 Classifier: Programming Language :: Python :: 3

{youclaw-4.6.11 → youclaw-4.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "youclaw"
-version = "4.6.11"
+version = "4.7.1"
 authors = [
   { name="Imran", email="imran@example.com" },
 ]

{youclaw-4.6.11 → youclaw-4.7.1}/src/youclaw/cli.py

@@ -150,26 +150,11 @@ class YouClawCLI:
             # Check if process is actually running
             os.kill(pid, 0)
             
-            # Get process info
-            import psutil
-            try:
-                process = psutil.Process(pid)
-                uptime_seconds = time.time() - process.create_time()
-                hours = int(uptime_seconds // 3600)
-                minutes = int((uptime_seconds % 3600) // 60)
-                
-                print(f"Status: ✅ Running")
-                print(f"PID: {pid}")
-                print(f"Uptime: {hours}h {minutes}m")
-                print(f"Memory: {process.memory_info().rss / 1024 / 1024:.1f} MB")
-                print(f"\n🔗 Dashboard: http://localhost:8080")
-                return 0
-            except ImportError:
-                # psutil not available, basic info only
-                print(f"Status: ✅ Running")
-                print(f"PID: {pid}")
-                print(f"\n🔗 Dashboard: http://localhost:8080")
-                return 0
+            # Basic info only (simplified for reliability)
+            print(f"Status: ✅ Running")
+            print(f"PID: {pid}")
+            print(f"\\n🔗 Dashboard: http://localhost:8080")
+            return 0
                 
         except (ProcessLookupError, ValueError):
             print("Status: ⚠️ Dead (PID file exists but process not found)")
@@ -203,46 +188,52 @@ class YouClawCLI:
 
         print("[!] Tip: Press ENTER to skip any step and configure later via Dashboard.\n")
 
+        # Helper to clean input (remove comments)
+        def clean_input(prompt, default=None):
+            val = input(prompt).strip()
+            if '#' in val: val = val.split('#')[0].strip()
+            return val or default
+
         # 🤖 Ollama Configuration
         print("🤖 Ollama AI Engine Configuration")
-        ollama_host = input("   - Ollama Host URL (default: http://localhost:11434): ").strip() or "http://localhost:11434"
-        ollama_model = input("   - Ollama Model (default: qwen2.5:1.5b-instruct): ").strip() or "qwen2.5:1.5b-instruct"
+        ollama_host = clean_input("   - Ollama Host URL (default: http://localhost:11434): ", "http://localhost:11434")
+        ollama_model = clean_input("   - Ollama Model (default: qwen2.5:1.5b-instruct): ", "qwen2.5:1.5b-instruct")
         
         # 🛰️ Telegram Setup
         print("\n🛰️ Telegram Bot Setup")
-        tg_token = input("   - Bot Token (from @BotFather): ").strip()
+        tg_token = clean_input("   - Bot Token (from @BotFather): ", "")
         
         # 💬 Discord Setup
         print("\n💬 Discord Bot Setup")
-        dc_token = input("   - Bot Token (from Discord Dev Portal): ").strip()
+        dc_token = clean_input("   - Bot Token (from Discord Dev Portal): ", "")
         
         # 🔍 Search Engine Setup
         print("\n🔍 Neural Search Engine")
-        search_url = input("   - Search URL (e.g. http://ip:8080/search): ").strip()
+        search_url = clean_input("   - Search URL (e.g. http://ip:8080/search): ", "")
 
         # 📧 Email Setup
         print("\n📧 Email Link Protocol")
-        email_user = input("   - Email Address: ").strip()
-        email_pass = input("   - App Password (not your login password!): ").strip()
-        email_imap = input("   - IMAP Host (default: imap.gmail.com): ").strip() or "imap.gmail.com"
-        email_smtp = input("   - SMTP Host (default: smtp.gmail.com): ").strip() or "smtp.gmail.com"
+        email_user = clean_input("   - Email Address: ", "")
+        email_pass = clean_input("   - App Password (not your login password!): ", "")
+        email_imap = clean_input("   - IMAP Host (default: imap.gmail.com): ", "imap.gmail.com")
+        email_smtp = clean_input("   - SMTP Host (default: smtp.gmail.com): ", "smtp.gmail.com")
 
-        # Write to .env
+        # Write to .env with proper quoting
         env_path = Path(".env")
         env_content = [
             "# YouClaw Managed Configuration",
-            f"OLLAMA_HOST={ollama_host}",
-            f"OLLAMA_MODEL={ollama_model}",
-            f"TELEGRAM_BOT_TOKEN={tg_token or ''}",
-            f"ENABLE_TELEGRAM={'true' if tg_token else 'false'}",
-            f"DISCORD_BOT_TOKEN={dc_token or ''}",
-            f"ENABLE_DISCORD={'true' if dc_token else 'false'}",
-            f"SEARCH_ENGINE_URL={search_url or 'http://localhost:8080/search'}",
-            f"EMAIL_USER={email_user or ''}",
-            f"EMAIL_PASSWORD={email_pass or ''}",
-            f"EMAIL_IMAP_HOST={email_imap}",
-            f"EMAIL_SMTP_HOST={email_smtp}",
-            f"ENABLE_EMAIL={'true' if email_user else 'false'}",
+            f'OLLAMA_HOST="{ollama_host}"',
+            f'OLLAMA_MODEL="{ollama_model}"',
+            f'TELEGRAM_BOT_TOKEN="{tg_token}"',
+            f'ENABLE_TELEGRAM="{"true" if tg_token else "false"}"',
+            f'DISCORD_BOT_TOKEN="{dc_token}"',
+            f'ENABLE_DISCORD="{"true" if dc_token else "false"}"',
+            f'SEARCH_ENGINE_URL="{search_url or "http://localhost:8080/search"}"',
+            f'EMAIL_USER="{email_user}"',
+            f'EMAIL_PASSWORD="{email_pass}"',
+            f'EMAIL_IMAP_HOST="{email_imap}"',
+            f'EMAIL_SMTP_HOST="{email_smtp}"',
+            f'ENABLE_EMAIL="{"true" if email_user else "false"}"',
             "DATABASE_PATH=./data/bot.db",
             "ADMIN_USER_IDENTITY=telegram:default"
         ]

{youclaw-4.6.11 → youclaw-4.7.1}/src/youclaw/dashboard.py

@@ -318,6 +318,7 @@ async def api_get_env(request):
             "telegram_token": env_vars.get("TELEGRAM_BOT_TOKEN", ""),
             "discord_token": env_vars.get("DISCORD_BOT_TOKEN", ""),
             "search_url": config.search_url,
+            "ollama_url": config.ollama.host,
             "email": {
                 "imap_host": config.email.imap_host,
                 "imap_port": config.email.imap_port,
@@ -349,6 +350,22 @@ async def api_save_system_secrets(request):
             val = data['search_url']
             env_manager.set_key("SEARCH_ENGINE_URL", val)
             await memory_manager.set_global_setting("search_url", val)
+            
+        ollama_status = "unchanged"
+        if 'ollama_url' in data:
+            val = data['ollama_url']
+            env_manager.set_key("OLLAMA_HOST", val)
+            await memory_manager.set_global_setting("ollama_host", val)
+            
+            # Instant validation
+            await config.refresh_from_db()
+            await ollama_client.initialize() # Re-init with new URL
+            try:
+                import asyncio
+                is_online = await asyncio.wait_for(ollama_client.check_health(), timeout=2.0)
+                ollama_status = "online" if is_online else "offline"
+            except:
+                ollama_status = "offline"
         
         # Email Secrets
         if 'email' in data:
@@ -364,7 +381,9 @@ async def api_save_system_secrets(request):
             
         bot_instance = request.app.get('bot')
         if bot_instance: asyncio.create_task(bot_instance.restart_handlers())
-        return web.json_response({"success": True})
+        bot_instance = request.app.get('bot')
+        if bot_instance: asyncio.create_task(bot_instance.restart_handlers())
+        return web.json_response({"success": True, "ollama_status": ollama_status})
     except Exception as e:
         return web.json_response({"error": str(e)}, status=500)
 
@@ -470,7 +489,7 @@ DASHBOARD_HTML = """
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>YouClaw V4.7 | Justice Neural Hub 🦞</title>
+    <title>YouClaw V4.7.0 | Justice Neural Hub 🦞</title>
     <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
     <style>
@@ -763,7 +782,7 @@ DASHBOARD_HTML = """
     <!-- Sidebar Navigation -->
     <nav class="sidebar" id="app-sidebar" style="display: none;">
         <div>
-            <div class="sidebar-logo">🦞 YOUCLAW <span style="font-size: 0.6rem; color: var(--primary);">V4.6</span></div>
+            <div class="sidebar-logo">🦞 YOUCLAW <span style="font-size: 0.6rem; color: var(--primary);">V4.7.0</span></div>
             <div class="nav-list">
                 <div class="nav-item active" id="nav-dash" onclick="switchView('dashboard')"><i>📊</i> Control Center</div>
                 <div class="nav-item" id="nav-chat" onclick="switchView('chat')"><i>💬</i> Neural Terminal</div>
@@ -802,6 +821,15 @@ DASHBOARD_HTML = """
                         </div>
                     </div>
 
+                    <div class="card" style="grid-column: span 6;">
+                        <div class="card-title">🧠 Neural Core Configuration</div>
+                        <div class="input-group">
+                            <span class="input-label">Ollama Host URL</span>
+                            <input type="text" id="vault-ollama" class="text-input" placeholder="http://localhost:11434">
+                        </div>
+                         <div style="font-size: 0.8rem; color: var(--text-dim); margin-top: -10px;">Changing this will instantly verify connectivity.</div>
+                    </div>
+
                     <div class="card" style="grid-column: span 6;">
                         <div class="card-title">🌐 Platform Connectivity</div>
                         <div style="display: flex; flex-direction: column; gap: 24px;">
@@ -1254,6 +1282,7 @@ DASHBOARD_HTML = """
                 document.getElementById('vault-tg').value = data.telegram_token || "";
                 document.getElementById('vault-dc').value = data.discord_token || "";
                 document.getElementById('vault-search').value = data.search_url || "";
+                document.getElementById('vault-ollama').value = data.ollama_url || "";
                 
                 if(data.email) {
                     document.getElementById('toggle-email').checked = data.email.enabled;
@@ -1311,6 +1340,7 @@ DASHBOARD_HTML = """
                 telegram_token: document.getElementById('vault-tg').value,
                 discord_token: document.getElementById('vault-dc').value,
                 search_url: document.getElementById('vault-search').value,
+                ollama_url: document.getElementById('vault-ollama').value,
                 email: {
                     imap_host: document.getElementById('vault-imap-host').value,
                     imap_port: parseInt(document.getElementById('vault-imap-port').value),
@@ -1320,7 +1350,14 @@ DASHBOARD_HTML = """
                     password: document.getElementById('vault-email-pass').value
                 }
             });
-            if(res.success) alert("Vault updated.");
+            if(res.success) {
+                let msg = "Vault updated.";
+                if(res.ollama_status !== "unchanged") {
+                    msg += " AI Core Status: " + res.ollama_status.toUpperCase();
+                }
+                alert(msg);
+                updateDashboard();
+            }
             btn.innerText = "Apply Changes"; btn.disabled = false;
         }
 

{youclaw-4.6.11 → youclaw-4.7.1/src/youclaw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: youclaw
-Version: 4.6.11
+Version: 4.7.1
 Summary: Your Personal AI Assistant - Universal Neural Core
 Author-email: Imran <imran@example.com>
 Classifier: Programming Language :: Python :: 3