termchat-client 0.2.1__tar.gz → 0.2.3__tar.gz

{termchat_client-0.2.1/termchat_client.egg-info → termchat_client-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termchat-client
-Version: 0.2.1
+Version: 0.2.3
 Summary: Lightweight, non-intrusive terminal chat client connecting to an online chat server with real-time text, images, and AI assistant.
 Author-email: TermChat Team <info@termchat.dev>
 License-Expression: MIT
@@ -102,21 +102,41 @@ pip install termchat-client
 
 ---
 
+## 🚀 Quickstart (Zero-Config)
+
+The client comes pre-configured with the live custom domain (`https://termchat.cliy.me/`) and automatic failover fallback to the Singapore Render server (`https://termchat-live.onrender.com`), so you can chat immediately:
+
+```bash
+pip install --upgrade termchat-client
+termchat
+```
+
+Or ask the free AI assistant right away:
+```bash
+termchat ai "What is the difference between a process and a thread?"
+```
+
+---
+
 ## 🚀 Terminal Client Usage
 
 ### 1. Run via CLI
 ```bash
-termchat --server https://my-chat.onrender.com --name Alice
+termchat --name Alice
+```
+Or specify a custom server if self-hosting:
+```bash
+termchat --server https://termchat.cliy.me --name Alice
 ```
 Or via Python module:
 ```bash
-python -m termchat --server https://my-chat.onrender.com --name Alice
+python -m termchat --name Alice
 ```
 
-### 2. Save Your Server Once
-Save your online server URL so you never need to type it again:
+### 2. Save Your Preferences Once
+Save your online server URL or default name so you never need to type them again:
 ```bash
-termchat --set-server https://my-chat.onrender.com
+termchat --set-server https://termchat.cliy.me
 termchat --set-name Alice
 ```
 Once saved, simply run:

{termchat_client-0.2.1 → termchat_client-0.2.3}/README.md

@@ -60,21 +60,41 @@ pip install termchat-client
 
 ---
 
+## 🚀 Quickstart (Zero-Config)
+
+The client comes pre-configured with the live custom domain (`https://termchat.cliy.me/`) and automatic failover fallback to the Singapore Render server (`https://termchat-live.onrender.com`), so you can chat immediately:
+
+```bash
+pip install --upgrade termchat-client
+termchat
+```
+
+Or ask the free AI assistant right away:
+```bash
+termchat ai "What is the difference between a process and a thread?"
+```
+
+---
+
 ## 🚀 Terminal Client Usage
 
 ### 1. Run via CLI
 ```bash
-termchat --server https://my-chat.onrender.com --name Alice
+termchat --name Alice
+```
+Or specify a custom server if self-hosting:
+```bash
+termchat --server https://termchat.cliy.me --name Alice
 ```
 Or via Python module:
 ```bash
-python -m termchat --server https://my-chat.onrender.com --name Alice
+python -m termchat --name Alice
 ```
 
-### 2. Save Your Server Once
-Save your online server URL so you never need to type it again:
+### 2. Save Your Preferences Once
+Save your online server URL or default name so you never need to type them again:
 ```bash
-termchat --set-server https://my-chat.onrender.com
+termchat --set-server https://termchat.cliy.me
 termchat --set-name Alice
 ```
 Once saved, simply run:

{termchat_client-0.2.1 → termchat_client-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "termchat-client"
-version = "0.2.1"
+version = "0.2.3"
 
 description = "Lightweight, non-intrusive terminal chat client connecting to an online chat server with real-time text, images, and AI assistant."
 

{termchat_client-0.2.1 → termchat_client-0.2.3}/termchat/__init__.py

@@ -3,7 +3,7 @@ termchat - Lightweight, non-intrusive terminal chat client with AI Assistant.
 Connects standard terminal input to your online Render/cloud server and receives text, images & AI responses.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"
 
 __author__ = "TermChat Contributors"
 __license__ = "MIT"

{termchat_client-0.2.1 → termchat_client-0.2.3}/termchat/cli.py

@@ -10,6 +10,9 @@ from termchat import __version__
 from termchat.ai import query_llm
 from termchat.client import start
 from termchat.config import (
+    DEFAULT_FALLBACK_SERVER,
+    PRIMARY_DEFAULT_SERVER,
+    get_default_servers,
     get_saved_ai_key,
     get_saved_server_url,
     get_saved_username,
@@ -97,23 +100,14 @@ def main():
             sys.exit(0)
 
 
-    # Determine server URL
-    server_url = args.server or get_saved_server_url()
-    if not server_url:
-        print("Welcome to termchat!")
-        try:
-            val = input("Enter your online chat server URL (e.g. https://my-app.onrender.com): ").strip()
-        except (KeyboardInterrupt, EOFError):
-            print("\nAborted.")
-            sys.exit(0)
-
-        if not val:
-            print("Error: A server URL is required.")
-            sys.exit(1)
-
-        set_saved_server_url(val)
-        server_url = val
-        print(f"Server saved to ~/.termchat.json. Next time you can just type 'termchat'!\n")
+    # Determine server URL and fallback failover
+    primary_srv, fallback_srv = get_default_servers()
+    if args.server:
+        server_url = args.server.strip()
+        fallback_url = None
+    else:
+        server_url = primary_srv
+        fallback_url = fallback_srv
 
     # Determine username
     username = args.name or get_saved_username()
@@ -121,6 +115,7 @@ def main():
     start(
         server_url=server_url,
         username=username,
+        fallback_url=fallback_url,
         auto_open=args.open,
         no_thumb=args.no_thumb,
     )

{termchat_client-0.2.1 → termchat_client-0.2.3}/termchat/client.py

@@ -29,11 +29,10 @@ class TerminalClient:
         self,
         server_url: str,
         username: str,
+        fallback_url: Optional[str] = None,
         auto_open_images: bool = False,
         show_thumbnails: bool = True,
     ):
-        self.raw_server_url = server_url
-        self.ws_url, self.http_base_url = normalize_urls(server_url)
         self.username = username
         self.auto_open_images = auto_open_images
         self.show_thumbnails = show_thumbnails
@@ -41,12 +40,24 @@ class TerminalClient:
         self.websocket = None
         self.last_downloaded_image: Optional[Path] = None
 
+        self.server_candidates = [server_url.strip()]
+        if fallback_url and fallback_url.strip() != server_url.strip():
+            self.server_candidates.append(fallback_url.strip())
+        self.server_index = 0
+        self._apply_server(self.server_candidates[0])
+
+    def _apply_server(self, server_url: str):
+        self.raw_server_url = server_url
+        self.ws_url, self.http_base_url = normalize_urls(server_url)
+
     def print_welcome(self):
         """Prints a simple standard-line connection notice."""
         print(f"\n--- termchat connected ---")
-        print(f"User:   {self.username}")
-        print(f"Server: {self.http_base_url}")
-        print(f"Web UI: {self.http_base_url} (open in browser to chat or send images)")
+        print(f"User:     {self.username}")
+        print(f"Server:   {self.http_base_url}")
+        print(f"Web UI:   {self.http_base_url} (open in browser to chat or send images)")
+        if len(self.server_candidates) > 1:
+            print(f"Fallback: {self.server_candidates[1]}")
         print(f"Commands: /help, /open (view last image), /quit")
         print(f"---------------------------\n")
 
@@ -199,7 +210,7 @@ class TerminalClient:
                 print(f"[Input error: {e}]")
 
     async def run(self):
-        """Main client loop with automatic reconnect."""
+        """Main client loop with automatic reconnect and fallback server failover."""
         self.print_welcome()
         session = PromptSession()
 
@@ -209,19 +220,20 @@ class TerminalClient:
             "client_type": "terminal",
             "device_info": device,
         })
-        full_ws = f"{self.ws_url}?{query_params}"
 
         with patch_stdout():
             while self.running:
+                full_ws = f"{self.ws_url}?{query_params}"
                 try:
                     print(f"Connecting to {self.http_base_url}...")
                     async with websockets.connect(
                         full_ws,
                         ping_interval=25,
                         ping_timeout=15,
+                        open_timeout=8,
                     ) as ws:
                         self.websocket = ws
-                        print("Connected! Start typing text below (Press Enter to send):\n")
+                        print(f"Connected to {self.http_base_url}! Start typing text below (Press Enter to send):\n")
 
                         recv_task = asyncio.create_task(self._receive_loop(ws))
                         input_task = asyncio.create_task(self._input_loop(session))
@@ -241,16 +253,34 @@ class TerminalClient:
                         if not self.running:
                             break
 
-                except (ConnectionRefusedError, OSError) as e:
+                except (ConnectionRefusedError, OSError, websockets.exceptions.WebSocketException, asyncio.TimeoutError) as e:
                     if not self.running:
                         break
-                    print(f"Could not connect to {self.http_base_url}. Retrying in 3s... (Ctrl+C to exit)")
-                    await asyncio.sleep(3)
+                    if len(self.server_candidates) > 1:
+                        next_idx = (self.server_index + 1) % len(self.server_candidates)
+                        next_server = self.server_candidates[next_idx]
+                        print(f"\n[Warning] {self.http_base_url} unreachable ({e}).")
+                        print(f"[Failover] Switching to fallback server: {next_server}...")
+                        self.server_index = next_idx
+                        self._apply_server(next_server)
+                        await asyncio.sleep(1)
+                    else:
+                        print(f"Could not connect to {self.http_base_url}. Retrying in 3s... (Ctrl+C to exit)")
+                        await asyncio.sleep(3)
                 except Exception as e:
                     if not self.running:
                         break
-                    print(f"Connection error: {e}. Retrying in 3s...")
-                    await asyncio.sleep(3)
+                    if len(self.server_candidates) > 1:
+                        next_idx = (self.server_index + 1) % len(self.server_candidates)
+                        next_server = self.server_candidates[next_idx]
+                        print(f"\n[Warning] Connection issue on {self.http_base_url}: {e}")
+                        print(f"[Failover] Switching to fallback server: {next_server}...")
+                        self.server_index = next_idx
+                        self._apply_server(next_server)
+                        await asyncio.sleep(1)
+                    else:
+                        print(f"Connection error: {e}. Retrying in 3s...")
+                        await asyncio.sleep(3)
 
         print("\nExiting termchat. Goodbye!")
 
@@ -258,12 +288,14 @@ class TerminalClient:
 def start(
     server_url: str,
     username: str,
+    fallback_url: Optional[str] = None,
     auto_open: bool = False,
     no_thumb: bool = False,
 ):
     client = TerminalClient(
         server_url=server_url,
         username=username,
+        fallback_url=fallback_url,
         auto_open_images=auto_open,
         show_thumbnails=not no_thumb,
     )

{termchat_client-0.2.1 → termchat_client-0.2.3}/termchat/config.py

@@ -7,10 +7,12 @@ and URL normalization for WebSocket and HTTP endpoints.
 import json
 import os
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Dict, Optional, Tuple
 
 CONFIG_FILE = Path.home() / ".termchat.json"
-DEFAULT_FALLBACK_SERVER = "https://termchat-live.onrender.com"
+PRIMARY_DEFAULT_SERVER = "https://termchat.cliy.me"
+FALLBACK_DEFAULT_SERVER = "https://termchat-live.onrender.com"
+DEFAULT_FALLBACK_SERVER = FALLBACK_DEFAULT_SERVER
 
 
 
@@ -34,19 +36,30 @@ def save_config(config: Dict[str, str]):
         print(f"[Warning] Could not save config file: {e}")
 
 
-def get_saved_server_url() -> Optional[str]:
-    """Retrieves server URL from ENV, config file, or None."""
+def get_default_servers() -> Tuple[str, Optional[str]]:
+    """
+    Returns (primary_server, fallback_server).
+    If custom server is configured via ENV or ~/.termchat.json, returns (custom, None).
+    Otherwise returns (PRIMARY_DEFAULT_SERVER, FALLBACK_DEFAULT_SERVER).
+    """
     # 1. Environment variable takes highest priority
     env_url = os.environ.get("TERMCHAT_SERVER")
     if env_url:
-        return env_url.strip()
+        return env_url.strip(), None
 
     # 2. Config file
     cfg = load_config()
     if "server" in cfg and cfg["server"]:
-        return cfg["server"].strip()
+        return cfg["server"].strip(), None
+
+    # 3. Default primary custom domain with Render Singapore fallback
+    return PRIMARY_DEFAULT_SERVER, FALLBACK_DEFAULT_SERVER
+
 
-    return None
+def get_saved_server_url() -> str:
+    """Retrieves server URL from ENV, config file, or falls back to PRIMARY_DEFAULT_SERVER."""
+    primary, _ = get_default_servers()
+    return primary
 
 
 def set_saved_server_url(url: str):

{termchat_client-0.2.1 → termchat_client-0.2.3/termchat_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termchat-client
-Version: 0.2.1
+Version: 0.2.3
 Summary: Lightweight, non-intrusive terminal chat client connecting to an online chat server with real-time text, images, and AI assistant.
 Author-email: TermChat Team <info@termchat.dev>
 License-Expression: MIT
@@ -102,21 +102,41 @@ pip install termchat-client
 
 ---
 
+## 🚀 Quickstart (Zero-Config)
+
+The client comes pre-configured with the live custom domain (`https://termchat.cliy.me/`) and automatic failover fallback to the Singapore Render server (`https://termchat-live.onrender.com`), so you can chat immediately:
+
+```bash
+pip install --upgrade termchat-client
+termchat
+```
+
+Or ask the free AI assistant right away:
+```bash
+termchat ai "What is the difference between a process and a thread?"
+```
+
+---
+
 ## 🚀 Terminal Client Usage
 
 ### 1. Run via CLI
 ```bash
-termchat --server https://my-chat.onrender.com --name Alice
+termchat --name Alice
+```
+Or specify a custom server if self-hosting:
+```bash
+termchat --server https://termchat.cliy.me --name Alice
 ```
 Or via Python module:
 ```bash
-python -m termchat --server https://my-chat.onrender.com --name Alice
+python -m termchat --name Alice
 ```
 
-### 2. Save Your Server Once
-Save your online server URL so you never need to type it again:
+### 2. Save Your Preferences Once
+Save your online server URL or default name so you never need to type them again:
 ```bash
-termchat --set-server https://my-chat.onrender.com
+termchat --set-server https://termchat.cliy.me
 termchat --set-name Alice
 ```
 Once saved, simply run:

{termchat_client-0.2.1 → termchat_client-0.2.3}/tests/test_config.py

@@ -1,4 +1,22 @@
-from termchat.config import normalize_urls
+from termchat.config import (
+    DEFAULT_FALLBACK_SERVER,
+    FALLBACK_DEFAULT_SERVER,
+    PRIMARY_DEFAULT_SERVER,
+    get_default_servers,
+    get_saved_server_url,
+    normalize_urls,
+)
+
+
+def test_get_saved_server_url_default(monkeypatch):
+    monkeypatch.delenv("TERMCHAT_SERVER", raising=False)
+    monkeypatch.setattr("termchat.config.load_config", lambda: {})
+    primary, fallback = get_default_servers()
+    assert primary == PRIMARY_DEFAULT_SERVER
+    assert "termchat.cliy.me" in primary
+    assert fallback == FALLBACK_DEFAULT_SERVER
+    assert "termchat-live.onrender.com" in fallback
+    assert get_saved_server_url() == PRIMARY_DEFAULT_SERVER
 
 
 def test_normalize_urls_https():