token-buffet 0.2.7__tar.gz → 0.2.8__tar.gz

{token_buffet-0.2.7/src/token_buffet.egg-info → token_buffet-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-buffet
-Version: 0.2.7
+Version: 0.2.8
 Summary: A pure-Python proxy and routing system to bridge CLI-based LLMs to a standard OpenAI-compatible API.
 Author: Jack
 License-Expression: MIT

{token_buffet-0.2.7 → token_buffet-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "token-buffet"
-version = "0.2.7"
+version = "0.2.8"
 authors = [
   { name="Jack" },
 ]

{token_buffet-0.2.7 → token_buffet-0.2.8/src/token_buffet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-buffet
-Version: 0.2.7
+Version: 0.2.8
 Summary: A pure-Python proxy and routing system to bridge CLI-based LLMs to a standard OpenAI-compatible API.
 Author: Jack
 License-Expression: MIT

token_buffet-0.2.8/src/tokenbuffet/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.2.8'

{token_buffet-0.2.7 → token_buffet-0.2.8}/src/tokenbuffet/cli.py

@@ -78,11 +78,11 @@ def init_workspace():
     print("\nNext: tbuffet start   (demos: tbuffet demo init)")
 
 
-def start_fleet(debug=False, foreground=True):
+def start_fleet(debug=False, foreground=True, router_port=8090):
     """Start the fleet; a foreground session owns its entire process trees."""
     processes = []
     try:
-        _start_fleet(debug, foreground, processes)
+        _start_fleet(debug, foreground, processes, router_port)
     except KeyboardInterrupt:
         if not foreground:
             raise
@@ -125,7 +125,7 @@ def _stop_started_processes(processes):
         raise RuntimeError("Could not stop all foreground services: " + "; ".join(failures))
 
 
-def _start_fleet(debug, foreground, processes):
+def _start_fleet(debug, foreground, processes, router_port):
     """Launch services and optionally wait for them in the foreground."""
     from tokenbuffet import loopback
     config_dir = Path("registered_providers")
@@ -202,10 +202,10 @@ def _start_fleet(debug, foreground, processes):
     for prov in pending:
         print(f"  {prov} did not start within 30s; starting the router without it.")
 
-    # 2. Start router on 8090
-    print("Starting Local Router on port 8090 (provider models and usage appear as each proxy finishes reading them)...")
+    # 2. Start router
+    print(f"Starting Local Router on port {router_port} (provider models and usage appear as each proxy finishes reading them)...")
     p = subprocess.Popen(
-        [sys.executable, "-m", "tokenbuffet.logged_run", "--log", "router/console.log", "--module", "tokenbuffet.local_router", "--port", "8090"],
+        [sys.executable, "-m", "tokenbuffet.logged_run", "--log", "router/console.log", "--module", "tokenbuffet.local_router", "--port", str(router_port)],
         **process_options,
     )
     processes.append(p)
@@ -659,7 +659,7 @@ def _cmd_service(args):
     verb, target = args.command.split("-")
     try:
         if target == "router":
-            result = (server.start_router if verb == "start" else server.stop_router)({})
+            result = (server.start_router if verb == "start" else server.stop_router)({"port": args.port} if verb == "start" else {})
         elif args.name:
             result = (server.launch_provider if verb == "start" else server.stop_provider)({"provider": args.name})
         else:
@@ -683,6 +683,7 @@ def main():
     start_parser = subparsers.add_parser("start", help="Start proxies, router, and dashboard; Ctrl+C stops them.")
     start_parser.add_argument("--debug", action="store_true", help="Capture full proxy request traces")
     start_parser.add_argument("--background", action="store_true", help="Launch services in the background instead of waiting for Ctrl+C")
+    start_parser.add_argument("--router-port", type=int, default=8090, help="Port for the router (default 8090)")
 
     stop_parser = subparsers.add_parser("stop", help="Stop all running services.")
     stop_parser.add_argument("--force", action="store_true", help="Kill the Token Buffet job and every Token Buffet service process (never apps)")
@@ -692,6 +693,7 @@ def main():
     restart_parser = subparsers.add_parser("restart", help="Stop then start all services.")
     restart_parser.add_argument("--debug", action="store_true")
     restart_parser.add_argument("--background", action="store_true", help="Launch services in the background instead of waiting for Ctrl+C")
+    restart_parser.add_argument("--router-port", type=int, default=8090, help="Port for the router (default 8090)")
 
     demo_parser = subparsers.add_parser("demo", help="Demo apps.")
     demo_parser.add_argument("action", choices=["init"], help="init: copy the demos, add them to their apps, report which can run")
@@ -739,18 +741,20 @@ def main():
     for verb in ("start", "stop"):
         provider_parser = subparsers.add_parser(f"{verb}-provider", help=f"{verb.capitalize()} one provider proxy, or every provider proxy when no name is given.")
         provider_parser.add_argument("name", nargs="?", help="Provider name (omit for all providers)")
-        subparsers.add_parser(f"{verb}-router", help=f"{verb.capitalize()} the router (port 8090).")
+        router_parser = subparsers.add_parser(f"{verb}-router", help=f"{verb.capitalize()} the router (default port 8090).")
+        if verb == "start":
+            router_parser.add_argument("--port", type=int, default=8090, help="Port for the router (default 8090)")
 
     args = parser.parse_args()
 
     if args.command == "init":
         init_workspace()
     elif args.command == "start":
-        start_fleet(debug=args.debug, foreground=not args.background)
+        start_fleet(debug=args.debug, foreground=not args.background, router_port=args.router_port)
     elif args.command == "restart":
         stop_fleet()
         time.sleep(2)
-        start_fleet(debug=args.debug, foreground=not args.background)
+        start_fleet(debug=args.debug, foreground=not args.background, router_port=args.router_port)
     elif args.command == "stop":
         force_stop() if args.force else stop_fleet()
     elif args.command == "status":

{token_buffet-0.2.7 → token_buffet-0.2.8}/src/tokenbuffet/cli_proxy_server.py

@@ -389,7 +389,7 @@ class ProxyHandler(BaseHTTPRequestHandler):
         from .gemini_wire import parse_generate_path
         request_path = urllib.parse.urlsplit(self.path).path
         gemini_route = parse_generate_path(self.path)
-        if request_path in ["/v1/chat/completions", "/api/chat"]:
+        if request_path in ["/v1/chat/completions", "/api/chat", "/v1/completions", "/api/generate"]:
             self.handle_chat()
         elif gemini_route:
             self.handle_chat(gemini=gemini_route)
@@ -505,7 +505,9 @@ class ProxyHandler(BaseHTTPRequestHandler):
 
         messages = payload.get("messages", [])
 
-        if not messages and "input" in payload:
+        if not messages and isinstance(payload.get("prompt"), str):
+            messages = [{"role": "user", "content": payload["prompt"]}]
+        elif not messages and "input" in payload:
             response_input = payload["input"]
             if isinstance(response_input, str):
                 messages = [{"role": "user", "content": response_input}]

{token_buffet-0.2.7 → token_buffet-0.2.8}/src/tokenbuffet/dashboard/server.py

@@ -525,15 +525,16 @@ def start_router(data):
     status = read_json(STATUS_DIR / "router_run_status.json", {})
     if status.get("status") == "running" and listening(status.get("port")):
         raise ValueError(f"Router is already running on port {status['port']}")
-    if listening(8090):
-        raise ValueError("Port 8090 is already in use")
+    port = data.get("port", 8090)
+    if listening(port):
+        raise ValueError(f"Port {port} is already in use")
     flags = subprocess.CREATE_NO_WINDOW if os.name == "nt" else 0
     output = LOG_DIR / "router" / "console.log"
     output.parent.mkdir(parents=True, exist_ok=True)
     with output.open("a", encoding="utf-8") as stream:
-        process = subprocess.Popen([sys.executable, "-m", "tokenbuffet.local_router", "--port", "8090"],
+        process = subprocess.Popen([sys.executable, "-m", "tokenbuffet.local_router", "--port", str(port)],
                                    cwd=ROOT, stdout=stream, stderr=subprocess.STDOUT, creationflags=flags)
-    return {"launched": True, "output": f"Router starting on port 8090 (pid {process.pid})"}
+    return {"launched": True, "output": f"Router starting on port {port} (pid {process.pid})"}
 
 
 def stop_router(data):

{token_buffet-0.2.7 → token_buffet-0.2.8}/src/tokenbuffet/local_router.py

@@ -813,13 +813,15 @@ if __name__ == "__main__":
     parser.add_argument("--port", type=int, default=8090, help="Port to bind the router to")
     parser.add_argument("--refresh-interval", type=int, default=1800,
                         help="Seconds between proxy metadata polls (0 means startup only)")
+    parser.add_argument("--extra", action="store_true",
+                        help="Run as an additional router: skip the single-router check and leave router_run_status.json alone")
     args = parser.parse_args()
 
     logging.info(f"Starting Multi-Provider Router on port {args.port}...")
     logging.info(f"Routing mode: {MODE}" + (f" (order: {', '.join(CUSTOM_ORDER)})" if MODE == "custom" and CUSTOM_ORDER else ""))
     logging.info(f"Reading usage and models from provider proxies every {args.refresh_interval}s.")
     start_refresher(args.refresh_interval)
-    existing_router_port = loopback.already_running(os.path.join("data", "providers_status", "router_run_status.json"))
+    existing_router_port = None if args.extra else loopback.already_running(os.path.join("data", "providers_status", "router_run_status.json"))
     if existing_router_port:
         logging.error(f"Cannot start router: one is already running on port {existing_router_port}.")
         sys.exit(1)
@@ -831,6 +833,8 @@ if __name__ == "__main__":
     port = server.server_address[1]
     if port != args.port:
         logging.warning(f"Port {args.port} is taken by another process; router is using {port}.")
+    if args.extra:
+        server.serve_forever()
     # Publish router PID so `tbuffet stop` can find and kill this process.
     _status_dir = os.path.join("data", "providers_status")
     os.makedirs(_status_dir, exist_ok=True)

token_buffet-0.2.7/src/tokenbuffet/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.2.7'