This commit is contained in:
+4
-1
@@ -5,6 +5,9 @@ OLLAMA_NUM_CTX=64512
|
||||
OPENAI_BASE_URL=https://api.openai.com/v1
|
||||
OPENAI_MODEL=gpt-5.4-mini
|
||||
OPENAI_API_KEY=
|
||||
DEEPSEEK_BASE_URL=https://api.deepseek.com
|
||||
DEEPSEEK_MODEL=deepseek-v4-flash
|
||||
DEEPSEEK_API_KEY=
|
||||
MODEL_REASONING_EFFORT=medium
|
||||
CODEX_COMMAND=codex
|
||||
CODEX_MODEL=gpt-5.4
|
||||
@@ -17,5 +20,5 @@ UEX_SECRET_KEY=
|
||||
UEX_BEARER_TOKEN=
|
||||
TRADERAI_USER_NAME=
|
||||
TRADERAI_MEMORY_PATH=
|
||||
UEX_NOTIFICATION_POLL_SECONDS=60
|
||||
UEX_NOTIFICATION_POLL_SECONDS=300
|
||||
REQUIRE_WRITE_APPROVAL=true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# TraderAI
|
||||
|
||||
Local Ollama-, OpenAI-, or Codex-powered chat for UEX marketplace workflows.
|
||||
Local Ollama-, DeepSeek-, OpenAI-, or Codex-powered chat for UEX marketplace workflows.
|
||||
|
||||
## What It Does
|
||||
|
||||
@@ -25,9 +25,10 @@ Local Ollama-, OpenAI-, or Codex-powered chat for UEX marketplace workflows.
|
||||
```
|
||||
|
||||
3. Create `.env` from `.env.example` and set `UEX_SECRET_KEY` and/or `UEX_BEARER_TOKEN` if you want authenticated actions.
|
||||
If you want the cheapest hosted default, set `MODEL_PROVIDER=deepseek`, set `DEEPSEEK_API_KEY`, and keep `DEEPSEEK_MODEL=deepseek-v4-flash` unless you specifically want `deepseek-v4-pro`.
|
||||
If you want to use OpenAI instead of Ollama, set `MODEL_PROVIDER=openai`, set `OPENAI_API_KEY`, and optionally change `OPENAI_MODEL` from the default `gpt-5.4-mini`.
|
||||
If you want to use Codex models with ChatGPT/Codex OAuth, install the Codex CLI, set `MODEL_PROVIDER=codex`, and optionally change `CODEX_MODEL` from the default `gpt-5.4`. TraderAI uses the local `codex app-server` JSON-RPC interface for both authentication and chat turns.
|
||||
`MODEL_REASONING_EFFORT` controls reasoning depth for OpenAI and Codex and defaults to `medium`.
|
||||
`MODEL_REASONING_EFFORT` controls reasoning depth for DeepSeek, OpenAI, and Codex and defaults to `medium`.
|
||||
`SCMDB_BASE_URL` defaults to `https://scmdb.net`.
|
||||
`CORNERSTONE_BASE_URL` defaults to `https://finder.cstone.space`.
|
||||
4. Install and run:
|
||||
@@ -41,7 +42,7 @@ Local Ollama-, OpenAI-, or Codex-powered chat for UEX marketplace workflows.
|
||||
|
||||
## Notes
|
||||
|
||||
Ollama runs locally at `http://localhost:11434` by default. This app can talk to Ollama's native chat API, OpenAI's Chat Completions API, or the local Codex App Server authenticated through ChatGPT/Codex OAuth, then executes approved UEX calls in the FastAPI backend. `OLLAMA_NUM_CTX` controls the per-request Ollama context window; `64512` is the default because Ollama recommends at least 64k tokens for agent-style workflows when hardware allows it.
|
||||
Ollama runs locally at `http://localhost:11434` by default. This app can talk to Ollama's native chat API, DeepSeek's OpenAI-compatible Chat Completions API, OpenAI's Chat Completions API, or the local Codex App Server authenticated through ChatGPT/Codex OAuth, then executes approved UEX calls in the FastAPI backend. `OLLAMA_NUM_CTX` controls the per-request Ollama context window; `64512` is the default because Ollama recommends at least 64k tokens for agent-style workflows when hardware allows it. DeepSeek context caching is provider-side and automatic when repeated prompt prefixes line up.
|
||||
|
||||
## Releases And Updates
|
||||
|
||||
|
||||
+3
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "traderai"
|
||||
version = "0.0.6"
|
||||
version = "0.0.8"
|
||||
description = "Local Ollama, OpenAI, or Codex assistant for UEX marketplace workflows."
|
||||
requires-python = ">=3.11"
|
||||
dependencies = [
|
||||
@@ -41,3 +41,5 @@ include = ["traderai*"]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import pytest
|
||||
import asyncio
|
||||
import itertools
|
||||
|
||||
from traderai.agent import OllamaAgent, SYSTEM_PROMPT
|
||||
from traderai.memory import MemoryStore
|
||||
@@ -217,6 +218,38 @@ def test_ollama_options_include_num_ctx():
|
||||
assert agent._ollama_options() == {"num_ctx": 64000}
|
||||
|
||||
|
||||
def test_deepseek_tool_rounds_are_not_capped_at_ten():
|
||||
agent = OllamaAgent("https://api.deepseek.com", "deepseek-v4-flash", EmptyTools(), provider="deepseek", api_key="test")
|
||||
|
||||
rounds = list(itertools.islice(agent._tool_rounds(), 12))
|
||||
|
||||
assert len(rounds) == 12
|
||||
|
||||
|
||||
def test_plan_draft_normalization_extracts_json_and_defaults():
|
||||
seed = {"title": "Wikelo Polaris", "objective": "Find parts", "kind": "buying", "constraints": {}, "items": []}
|
||||
raw = 'draft:\n{"title":"Wikelo Polaris Parts","objective":"Find and draft deals for the parts below","kind":"buying","cadence":"0 */3 * * *","constraints":{"message_tone":"casual","instructions":"Prioritize cheap listings first."},"items":[{"item_name":"RCMBNT-RGL-1","desired_quantity":2}]}'
|
||||
|
||||
draft = OllamaAgent._normalize_plan_draft(raw, seed)
|
||||
|
||||
assert draft["title"] == "Wikelo Polaris Parts"
|
||||
assert draft["cadence"] == "0 */3 * * *"
|
||||
assert draft["constraints"]["message_tone"] == "casual"
|
||||
assert draft["items"][0]["item_name"] == "RCMBNT-RGL-1"
|
||||
assert draft["items"][0]["desired_quantity"] == 2
|
||||
|
||||
|
||||
def test_plan_draft_heuristic_fills_in_basic_instructions():
|
||||
seed = {"title": "Watch open negotiations", "objective": "", "kind": "custom", "constraints": {}, "items": []}
|
||||
|
||||
draft = OllamaAgent._heuristic_plan_draft(seed)
|
||||
|
||||
assert draft["kind"] == "custom"
|
||||
assert draft["cadence"] == "0 */4 * * *"
|
||||
assert "summarize" in draft["constraints"]["instructions"].casefold()
|
||||
assert draft["constraints"]["message_tone"] == "friendly and direct"
|
||||
|
||||
|
||||
def test_codex_prompt_mentions_tools_and_images(tmp_path):
|
||||
memory = MemoryStore(str(tmp_path / "memory.sqlite3"))
|
||||
agent = OllamaAgent("codex", "gpt-5.3-codex", EmptyTools(), memory=memory, provider="codex")
|
||||
@@ -257,6 +290,34 @@ def test_codex_prompt_mentions_tools_and_images(tmp_path):
|
||||
assert "tool search_marketplace_listings" in prompt
|
||||
|
||||
|
||||
def test_deepseek_openai_messages_include_reasoning_content_for_tool_turns():
|
||||
agent = OllamaAgent("https://api.deepseek.com", "deepseek-v4-flash", EmptyTools(), provider="deepseek", api_key="test")
|
||||
|
||||
messages = agent._openai_messages(
|
||||
"check listing",
|
||||
[
|
||||
{"role": "system", "content": SYSTEM_PROMPT},
|
||||
{"role": "user", "content": "Check this listing"},
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": "",
|
||||
"reasoning_content": "I should check the current listing first.",
|
||||
"tool_calls": [
|
||||
{
|
||||
"id": "call_123",
|
||||
"type": "function",
|
||||
"function": {"name": "search_marketplace_listings", "arguments": "{\"query\":\"panel\"}"},
|
||||
}
|
||||
],
|
||||
},
|
||||
{"role": "tool", "tool_name": "search_marketplace_listings", "tool_call_id": "call_123", "content": "{\"ok\":true}"},
|
||||
],
|
||||
)
|
||||
|
||||
assistant_turn = next(message for message in messages if message["role"] == "assistant")
|
||||
assert assistant_turn["reasoning_content"] == "I should check the current listing first."
|
||||
|
||||
|
||||
def test_codex_structured_response_extracts_text_and_tool_calls():
|
||||
agent = OllamaAgent("codex", "gpt-5.3-codex", EmptyTools(), provider="codex")
|
||||
|
||||
|
||||
+20
-2
@@ -1,10 +1,22 @@
|
||||
from traderai.config import Settings
|
||||
|
||||
|
||||
def test_model_provider_accepts_codex():
|
||||
def test_model_provider_codex_falls_back_to_ollama():
|
||||
settings = Settings(model_provider="codex")
|
||||
|
||||
assert settings.model_provider == "codex"
|
||||
assert settings.model_provider == "ollama"
|
||||
|
||||
|
||||
def test_model_provider_openai_falls_back_to_ollama():
|
||||
settings = Settings(model_provider="openai")
|
||||
|
||||
assert settings.model_provider == "ollama"
|
||||
|
||||
|
||||
def test_model_provider_accepts_deepseek():
|
||||
settings = Settings(model_provider="deepseek")
|
||||
|
||||
assert settings.model_provider == "deepseek"
|
||||
|
||||
|
||||
def test_model_provider_invalid_value_falls_back_to_ollama():
|
||||
@@ -23,3 +35,9 @@ def test_reasoning_effort_accepts_supported_values():
|
||||
settings = Settings(model_reasoning_effort="high")
|
||||
|
||||
assert settings.model_reasoning_effort == "high"
|
||||
|
||||
|
||||
def test_reasoning_effort_accepts_max():
|
||||
settings = Settings(model_reasoning_effort="max")
|
||||
|
||||
assert settings.model_reasoning_effort == "max"
|
||||
|
||||
@@ -55,3 +55,22 @@ def test_memory_store_renames_threads_and_deletes_outbox_items(tmp_path):
|
||||
assert renamed["title"] == "Market Check"
|
||||
assert deleted is True
|
||||
assert store.list_outbox() == []
|
||||
|
||||
|
||||
def test_memory_store_uses_absolute_path_across_working_directory_changes(tmp_path, monkeypatch):
|
||||
original_cwd = tmp_path / "start"
|
||||
original_cwd.mkdir()
|
||||
monkeypatch.chdir(original_cwd)
|
||||
|
||||
store = MemoryStore("data/memory.sqlite3")
|
||||
|
||||
moved_cwd = tmp_path / "moved"
|
||||
moved_cwd.mkdir()
|
||||
monkeypatch.chdir(moved_cwd)
|
||||
|
||||
store.add_outbox("Notification survived cwd change")
|
||||
|
||||
snapshot = store.inspect()
|
||||
|
||||
assert store.path.is_absolute()
|
||||
assert snapshot["outbox"][0]["content"] == "Notification survived cwd change"
|
||||
|
||||
@@ -142,6 +142,9 @@ async def test_buying_runner_tracks_candidates_and_drafts_only(tmp_path):
|
||||
assert len(tools.pending_actions) == 1
|
||||
assert not tools.uex.posts
|
||||
assert "Drafted 1 negotiation" in memory.list_outbox()[0]["content"]
|
||||
pending = next(iter(tools.pending_actions.values()))
|
||||
assert "Tone note" not in pending.payload["message"]
|
||||
assert "Polaris build" not in pending.payload["message"] or "putting together parts for a Polaris build" in pending.payload["message"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
||||
+110
-5
@@ -86,6 +86,7 @@ def test_config_update_rebuilds_runtime_without_restart(monkeypatch, tmp_path):
|
||||
model_provider=values.get("model_provider", state["settings"].model_provider),
|
||||
ollama_model=values.get("ollama_model", state["settings"].ollama_model),
|
||||
codex_model=values.get("codex_model", state["settings"].codex_model),
|
||||
deepseek_model=values.get("deepseek_model", state["settings"].deepseek_model),
|
||||
)
|
||||
return {"values": values, "fields": {}, "secrets_configured": {}, "app_data_dir": str(tmp_path)}
|
||||
|
||||
@@ -114,19 +115,120 @@ def test_config_update_rebuilds_runtime_without_restart(monkeypatch, tmp_path):
|
||||
|
||||
updated = client.post(
|
||||
"/api/config",
|
||||
json={"values": {"model_provider": "codex", "codex_model": "gpt-5.4"}},
|
||||
json={"values": {"model_provider": "deepseek", "deepseek_model": "deepseek-v4-flash"}},
|
||||
).json()
|
||||
assert updated["restart_required"] is False
|
||||
|
||||
after = client.get("/api/health").json()
|
||||
assert after["model_provider"] == "codex"
|
||||
assert after["inference"]["provider"] == "codex"
|
||||
assert after["model_provider"] == "deepseek"
|
||||
assert after["inference"]["provider"] == "deepseek"
|
||||
|
||||
chat = client.post("/api/chat", json={"message": "hi", "thread_id": "thread-1", "images": []}).json()
|
||||
assert chat["message"] == "codex:gpt-5.4"
|
||||
assert chat["message"] == "deepseek:deepseek-v4-flash"
|
||||
|
||||
|
||||
def make_settings(tmp_path, model_provider="ollama", ollama_model="qwen3.5:9b", codex_model="gpt-5.4"):
|
||||
def test_plan_draft_endpoint_returns_agent_draft(monkeypatch, tmp_path):
|
||||
state = {"settings": make_settings(tmp_path)}
|
||||
|
||||
class FakeScheduler:
|
||||
def __init__(self, memory):
|
||||
self.memory = memory
|
||||
|
||||
def bind_agent(self, agent):
|
||||
self.agent = agent
|
||||
|
||||
def bind_plan_runner(self, plan_runner):
|
||||
self.plan_runner = plan_runner
|
||||
|
||||
def bind_uex_notifications(self, uex, poll_seconds=60):
|
||||
self.uex = uex
|
||||
self.poll_seconds = poll_seconds
|
||||
|
||||
def start(self):
|
||||
return None
|
||||
|
||||
def shutdown(self):
|
||||
return None
|
||||
|
||||
def list_jobs(self):
|
||||
return []
|
||||
|
||||
class FakeUEXClient:
|
||||
def __init__(self, *args, **kwargs):
|
||||
pass
|
||||
|
||||
async def get_user(self, username=None, authenticated=False):
|
||||
return {}
|
||||
|
||||
class FakeToolRegistry:
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.pending_actions = {}
|
||||
self.plan_runner = None
|
||||
|
||||
async def approve(self, action_id):
|
||||
return {"approved": action_id}
|
||||
|
||||
async def decline(self, action_id):
|
||||
return {"declined": action_id}
|
||||
|
||||
class FakePlanRunner:
|
||||
def __init__(self, store, tools, memory, agent=None):
|
||||
self.store = store
|
||||
self.tools = tools
|
||||
self.memory = memory
|
||||
self.agent = agent
|
||||
|
||||
def bind_agent(self, agent):
|
||||
self.agent = agent
|
||||
|
||||
class FakeClient:
|
||||
def __init__(self, *args, **kwargs):
|
||||
pass
|
||||
|
||||
def fake_get_settings():
|
||||
return state["settings"]
|
||||
|
||||
monkeypatch.setattr(server, "WakeScheduler", FakeScheduler)
|
||||
monkeypatch.setattr(server, "UEXClient", FakeUEXClient)
|
||||
monkeypatch.setattr(server, "ToolRegistry", FakeToolRegistry)
|
||||
monkeypatch.setattr(server, "ContinualPlanRunner", FakePlanRunner)
|
||||
monkeypatch.setattr(server, "SCMDBClient", FakeClient)
|
||||
monkeypatch.setattr(server, "CornerstoneClient", FakeClient)
|
||||
monkeypatch.setattr(server, "StarCitizenWikiClient", FakeClient)
|
||||
monkeypatch.setattr(server, "get_settings", fake_get_settings)
|
||||
monkeypatch.setattr(
|
||||
server,
|
||||
"settings_payload",
|
||||
lambda settings=None: {"app_data_dir": str(tmp_path), "values": {}, "fields": {}, "secrets_configured": {}},
|
||||
)
|
||||
|
||||
async def fake_generate_plan_draft(self, title="", objective="", kind="buying", constraints=None, items=None):
|
||||
return {
|
||||
"title": title or "Draft title",
|
||||
"objective": objective or "Draft objective",
|
||||
"kind": kind,
|
||||
"cadence": "0 */3 * * *",
|
||||
"constraints": {"message_tone": "friendly and direct", "instructions": "Start with the best listings."},
|
||||
"items": [{"item_name": "RCMBNT-RGL-1", "desired_quantity": 1, "max_unit_price": None}],
|
||||
}
|
||||
|
||||
monkeypatch.setattr(server.OllamaAgent, "generate_plan_draft", fake_generate_plan_draft)
|
||||
|
||||
app = server.create_app()
|
||||
with TestClient(app) as client:
|
||||
response = client.post(
|
||||
"/api/plans/draft",
|
||||
json={"title": "Polaris parts", "objective": "Find the required parts", "kind": "buying", "constraints": {}, "items": []},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
draft = response.json()["draft"]
|
||||
assert draft["cadence"] == "0 */3 * * *"
|
||||
assert draft["constraints"]["instructions"] == "Start with the best listings."
|
||||
assert draft["items"][0]["item_name"] == "RCMBNT-RGL-1"
|
||||
|
||||
|
||||
def make_settings(tmp_path, model_provider="ollama", ollama_model="qwen3.5:9b", codex_model="gpt-5.4", deepseek_model="deepseek-v4-flash"):
|
||||
return SimpleNamespace(
|
||||
traderai_memory_path=str(tmp_path / "memory.sqlite3"),
|
||||
model_provider=model_provider,
|
||||
@@ -136,6 +238,9 @@ def make_settings(tmp_path, model_provider="ollama", ollama_model="qwen3.5:9b",
|
||||
openai_base_url="https://api.openai.com/v1",
|
||||
openai_api_key=None,
|
||||
openai_model="gpt-5.4-mini",
|
||||
deepseek_base_url="https://api.deepseek.com",
|
||||
deepseek_api_key=None,
|
||||
deepseek_model=deepseek_model,
|
||||
model_reasoning_effort="medium",
|
||||
codex_command="codex",
|
||||
codex_model=codex_model,
|
||||
|
||||
@@ -368,6 +368,37 @@ class FakeSCWiki:
|
||||
}
|
||||
|
||||
|
||||
class FakeWikelo:
|
||||
base_url = "https://wikelo-projects.test"
|
||||
|
||||
async def list_ship_projects(self):
|
||||
return [
|
||||
{
|
||||
"id": "ship-1",
|
||||
"ship_name": "Polaris Wikelo Special",
|
||||
"description": "Now make Polaris. Short Time Deal",
|
||||
"status": "planning",
|
||||
"privacy": "public",
|
||||
"owner_name": "Chimpanz33",
|
||||
"required_materials": [
|
||||
{"material_name": "Wikelo Favor", "quantity_needed": 50.0, "quantity_collected": 0.0},
|
||||
{"material_name": "Polaris Bit", "quantity_needed": 15.0, "quantity_collected": 2.0},
|
||||
],
|
||||
},
|
||||
{
|
||||
"id": "ship-2",
|
||||
"ship_name": "Guardian",
|
||||
"description": "Guardian Fight Mod",
|
||||
"status": "planning",
|
||||
"privacy": "public",
|
||||
"owner_name": "Chimpanz33",
|
||||
"required_materials": [
|
||||
{"material_name": "Wikelo Favor", "quantity_needed": 20.0, "quantity_collected": 0.0},
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_marketplace_listings_filters_locally():
|
||||
registry = ToolRegistry(FakeUEX())
|
||||
@@ -686,6 +717,35 @@ async def test_get_scwiki_vehicle_returns_ship_prices_and_store_context():
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_wikelo_ship_projects_returns_material_matches():
|
||||
registry = ToolRegistry(FakeUEX(), wikelo=FakeWikelo())
|
||||
|
||||
result = await registry.search_wikelo_ship_projects(query="Polaris")
|
||||
|
||||
assert result["source"] == "https://wikelo-projects.test/Ships"
|
||||
assert result["matched"] == 1
|
||||
assert result["projects"][0]["ship_name"] == "Polaris Wikelo Special"
|
||||
assert result["projects"][0]["required_materials"][0]["material_name"] == "Wikelo Favor"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_wikelo_ship_project_returns_full_requirements():
|
||||
registry = ToolRegistry(FakeUEX(), wikelo=FakeWikelo())
|
||||
|
||||
result = await registry.get_wikelo_ship_project(ship_name="Guardian")
|
||||
|
||||
assert result["project"]["ship_name"] == "Guardian"
|
||||
assert result["project"]["materials_count"] == 1
|
||||
assert result["project"]["required_materials"] == [
|
||||
{
|
||||
"material_name": "Wikelo Favor",
|
||||
"quantity_needed": 20,
|
||||
"quantity_collected": 0,
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_draft_marketplace_listing_with_cornerstone_image_adds_image_data_and_redacts_display():
|
||||
registry = ToolRegistry(FakeUEX(), cornerstone=FakeCornerstone())
|
||||
|
||||
+453
File diff suppressed because one or more lines are too long
+396
-38
@@ -20,7 +20,8 @@ from traderai.tools import ToolRegistry
|
||||
from traderai.version import __version__
|
||||
|
||||
|
||||
SYSTEM_PROMPT = """You are TraderAI, a local assistant for UEX marketplace work.
|
||||
SYSTEM_PROMPT = """You are TraderAI, a sharp Star Citizen marketplace copilot for UEX work.
|
||||
Sound like a competent player who knows the game and the market. Be natural, direct, and helpful. Avoid corporate filler, robotic phrasing, and meta notes.
|
||||
Use tools when the user asks about UEX data, open/current listings, active negotiations, unread notifications, messages, offers, or posting ads.
|
||||
Use continual plan tools when the user asks for multi-day or recurring marketplace work, such as finding several parts, watching for deals, tracking candidates, or coordinating negotiations over time.
|
||||
UEX credentials are configured server-side when available. Never ask the user to provide UEX_SECRET_KEY or UEX_BEARER_TOKEN in chat; call the authenticated UEX tool and only mention credential configuration if the tool returns an authentication error.
|
||||
@@ -29,11 +30,13 @@ When the user asks for history, trends, changes over time, or past prices, prefe
|
||||
When you need missing Star Citizen knowledge to answer accurately, use Star Citizen Wiki tools during your reasoning instead of guessing.
|
||||
Use SCMDB tools when the user asks about Star Citizen missions/contracts, mission rewards, payouts, reputation gains, item rewards, blueprint rewards, or hauling mission cargo. Prefer SCMDB live data unless the user asks for PTU or a specific game version.
|
||||
Use Star Citizen Wiki tools for general game knowledge, ships and vehicles, store availability, purchase locations, ship prices, manufacturers, locations, and page summaries from starcitizen.tools.
|
||||
Use Wikelo ship project tools when the user asks for Wikelo ship requirements, Wikelo build materials, or what items are needed for a Wikelo ship project.
|
||||
Use Cornerstone tools when the user asks where an item is sold, which shops carry an item, item store locations, in-game item base prices, or Universal Item Finder data.
|
||||
When drafting UEX marketplace item posts that need images, use Cornerstone media tools or draft_marketplace_listing_with_cornerstone_image so the pending listing can include UEX image_data sourced from Cornerstone.
|
||||
Prefer open and current UEX marketplace information. Do not use historical sale data, completed sale records, or sale/average-history information unless the user explicitly asks for historical sales.
|
||||
Treat UEX marketplace prices as in-game aUEC/UEC credits, never real-world dollars, unless the user explicitly says otherwise.
|
||||
For marketplace writes, draft the exact pending action and tell the user what will be sent; never claim it was sent until approval succeeds.
|
||||
When drafting negotiation messages or marketplace replies, write like a real player would. Keep messages human, concise, and purposeful. Never include internal notes like "Tone note".
|
||||
For continual plans, never invent an unknown parts checklist. If the required items cannot be derived from provided details or tools, create the plan in a needs-input state and say what item list is missing.
|
||||
When a scheduled wake job fires, always write a concise Inbox-ready result that says what you checked, the key findings, and the suggested next action.
|
||||
Keep prices, listing ids, slugs, users, and UEX status codes precise. If data is missing, say what you need next."""
|
||||
@@ -64,7 +67,7 @@ class OllamaAgent:
|
||||
self.thread_messages: dict[str, list[dict[str, Any]]] = {}
|
||||
|
||||
async def health(self) -> dict[str, Any]:
|
||||
if self.provider == "openai":
|
||||
if self._is_openai_compatible_provider():
|
||||
return await self._openai_health()
|
||||
if self.provider == "codex":
|
||||
return await self._codex_health()
|
||||
@@ -119,7 +122,7 @@ class OllamaAgent:
|
||||
last_tool_results: list[dict[str, Any]] = []
|
||||
image_scope = self.tools.chat_image_scope(normalized_images) if hasattr(self.tools, "chat_image_scope") else nullcontext()
|
||||
with image_scope:
|
||||
for _ in range(10):
|
||||
for _ in self._tool_rounds():
|
||||
try:
|
||||
response = await self._chat_once(
|
||||
prompt_text,
|
||||
@@ -155,7 +158,7 @@ class OllamaAgent:
|
||||
result = await self.tools.execute(name, arguments)
|
||||
last_tool_results.append({"tool": name, "result": result})
|
||||
messages.append({"role": "tool", "tool_name": name, "tool_call_id": call.get("id"), "content": json.dumps(result)})
|
||||
fallback = "I hit the tool-call limit while working on that. Try narrowing the request or approve any pending action first."
|
||||
fallback = self._tool_round_limit_message()
|
||||
messages.append({"role": "assistant", "content": fallback})
|
||||
if self.memory:
|
||||
self.memory.add_conversation("assistant", fallback, resolved_thread_id)
|
||||
@@ -187,7 +190,7 @@ class OllamaAgent:
|
||||
last_tool_results: list[dict[str, Any]] = []
|
||||
image_scope = self.tools.chat_image_scope(normalized_images) if hasattr(self.tools, "chat_image_scope") else nullcontext()
|
||||
with image_scope:
|
||||
for _ in range(10):
|
||||
for _ in self._tool_rounds():
|
||||
assistant_message: dict[str, Any] = {"role": "assistant", "content": ""}
|
||||
tool_calls: list[dict[str, Any]] = []
|
||||
|
||||
@@ -198,7 +201,15 @@ class OllamaAgent:
|
||||
previous_interaction=previous_interaction,
|
||||
thread_id=resolved_thread_id,
|
||||
):
|
||||
if event.get("type") == "reasoning":
|
||||
reasoning_chunk = event.get("content") or ""
|
||||
if reasoning_chunk:
|
||||
assistant_message["reasoning_content"] = assistant_message.get("reasoning_content", "") + reasoning_chunk
|
||||
yield {"type": "reasoning", "content": reasoning_chunk}
|
||||
continue
|
||||
message = event.get("message") or {}
|
||||
if message.get("reasoning_content"):
|
||||
assistant_message["reasoning_content"] = message.get("reasoning_content")
|
||||
chunk = message.get("content") or ""
|
||||
if chunk:
|
||||
assistant_message["content"] += chunk
|
||||
@@ -247,7 +258,7 @@ class OllamaAgent:
|
||||
messages.append({"role": "tool", "tool_name": name, "tool_call_id": call.get("id"), "content": json.dumps(result)})
|
||||
|
||||
yield {"type": "status", "message": "Writing response"}
|
||||
fallback = "I hit the tool-call limit while working on that. Try narrowing the request or approve any pending action first."
|
||||
fallback = self._tool_round_limit_message()
|
||||
messages.append({"role": "assistant", "content": fallback})
|
||||
if self.memory:
|
||||
self.memory.add_conversation("assistant", fallback, resolved_thread_id)
|
||||
@@ -260,7 +271,7 @@ class OllamaAgent:
|
||||
previous_interaction = self.memory.last_interaction("wake") if self.memory else None
|
||||
messages.append({"role": "user", "content": wake_message})
|
||||
last_tool_results: list[dict[str, Any]] = []
|
||||
for _ in range(10):
|
||||
for _ in self._tool_rounds():
|
||||
try:
|
||||
response = await self._chat_once(
|
||||
wake_message,
|
||||
@@ -298,7 +309,7 @@ class OllamaAgent:
|
||||
result = await self.tools.execute(name, arguments)
|
||||
last_tool_results.append({"tool": name, "result": result})
|
||||
messages.append({"role": "tool", "tool_name": name, "tool_call_id": call.get("id"), "content": json.dumps(result)})
|
||||
content = "I hit the tool-call limit while running this scheduled wake job. Check the job prompt or pending approvals."
|
||||
content = self._wake_tool_round_limit_message()
|
||||
messages.append({"role": "assistant", "content": content})
|
||||
if self.memory:
|
||||
self.memory.add_conversation("system", wake_message, "wake")
|
||||
@@ -312,7 +323,7 @@ class OllamaAgent:
|
||||
previous_interaction: dict[str, Any] | None = None,
|
||||
thread_id: str | None = DEFAULT_THREAD_ID,
|
||||
) -> dict[str, Any]:
|
||||
if self.provider == "openai":
|
||||
if self._is_openai_compatible_provider():
|
||||
return await self._openai_chat(
|
||||
query,
|
||||
messages,
|
||||
@@ -340,7 +351,7 @@ class OllamaAgent:
|
||||
previous_interaction: dict[str, Any] | None = None,
|
||||
thread_id: str | None = DEFAULT_THREAD_ID,
|
||||
) -> AsyncIterator[dict[str, Any]]:
|
||||
if self.provider == "openai":
|
||||
if self._is_openai_compatible_provider():
|
||||
async for event in self._openai_chat_stream(
|
||||
query,
|
||||
messages,
|
||||
@@ -441,8 +452,8 @@ class OllamaAgent:
|
||||
thread_id=thread_id,
|
||||
),
|
||||
"tools": self.tools.schemas,
|
||||
"reasoning_effort": self.reasoning_effort,
|
||||
"stream": False,
|
||||
**self._openai_request_options(stream=False),
|
||||
},
|
||||
)
|
||||
response.raise_for_status()
|
||||
@@ -452,6 +463,7 @@ class OllamaAgent:
|
||||
return {
|
||||
"message": {
|
||||
"role": message.get("role", "assistant"),
|
||||
"reasoning_content": message.get("reasoning_content") or "",
|
||||
"content": message.get("content") or "",
|
||||
"tool_calls": message.get("tool_calls") or [],
|
||||
}
|
||||
@@ -479,8 +491,8 @@ class OllamaAgent:
|
||||
thread_id=thread_id,
|
||||
),
|
||||
"tools": self.tools.schemas,
|
||||
"reasoning_effort": self.reasoning_effort,
|
||||
"stream": True,
|
||||
**self._openai_request_options(stream=True),
|
||||
},
|
||||
) as response:
|
||||
response.raise_for_status()
|
||||
@@ -493,8 +505,15 @@ class OllamaAgent:
|
||||
if payload == "[DONE]":
|
||||
break
|
||||
event = json.loads(payload)
|
||||
if event.get("usage"):
|
||||
metrics = self._cloud_usage_metrics(event["usage"])
|
||||
if metrics:
|
||||
yield {"type": "metrics", **metrics}
|
||||
choice = (event.get("choices") or [{}])[0]
|
||||
delta = choice.get("delta") or {}
|
||||
reasoning_content = delta.get("reasoning_content") or ""
|
||||
if reasoning_content:
|
||||
yield {"type": "reasoning", "content": reasoning_content}
|
||||
content = delta.get("content") or ""
|
||||
if content:
|
||||
yield {"message": {"role": "assistant", "content": content}}
|
||||
@@ -502,9 +521,11 @@ class OllamaAgent:
|
||||
self._merge_openai_tool_call(tool_calls, tool_call)
|
||||
finish_reason = choice.get("finish_reason")
|
||||
if finish_reason:
|
||||
message = choice.get("message") or {}
|
||||
yield {
|
||||
"message": {
|
||||
"role": "assistant",
|
||||
"reasoning_content": message.get("reasoning_content") or "",
|
||||
"content": "",
|
||||
"tool_calls": self._ordered_tool_calls(tool_calls),
|
||||
},
|
||||
@@ -574,18 +595,19 @@ class OllamaAgent:
|
||||
continue
|
||||
attached_image_count = len(message.get("images") or [])
|
||||
break
|
||||
context = self._runtime_context(
|
||||
stable_context, volatile_context = self._runtime_context_parts(
|
||||
query,
|
||||
previous_interaction=previous_interaction,
|
||||
thread_id=thread_id,
|
||||
attached_image_count=attached_image_count,
|
||||
)
|
||||
if not context:
|
||||
contexts = [part for part in ("\n".join(stable_context), "\n".join(volatile_context)) if part]
|
||||
if not contexts:
|
||||
return messages
|
||||
return [messages[0], {"role": "system", "content": context}, *messages[1:]]
|
||||
return [messages[0], *({"role": "system", "content": context} for context in contexts), *messages[1:]]
|
||||
|
||||
async def _openai_health(self) -> dict[str, Any]:
|
||||
return await self._cloud_health("openai")
|
||||
return await self._cloud_health(self.provider if self._is_openai_compatible_provider() else "openai")
|
||||
|
||||
async def _codex_health(self) -> dict[str, Any]:
|
||||
command = self._codex_command()
|
||||
@@ -671,6 +693,19 @@ class OllamaAgent:
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
def _openai_request_options(self, stream: bool) -> dict[str, Any]:
|
||||
if self.provider == "deepseek":
|
||||
options: dict[str, Any] = {}
|
||||
if self.reasoning_effort in {"none", "minimal"}:
|
||||
options["thinking"] = {"type": "disabled"}
|
||||
else:
|
||||
options["thinking"] = {"type": "enabled"}
|
||||
options["reasoning_effort"] = "max" if self.reasoning_effort in {"xhigh", "max"} else "high"
|
||||
if stream:
|
||||
options["stream_options"] = {"include_usage": True}
|
||||
return options
|
||||
return {"reasoning_effort": self.reasoning_effort}
|
||||
|
||||
def _openai_messages(
|
||||
self,
|
||||
query: str,
|
||||
@@ -706,6 +741,8 @@ class OllamaAgent:
|
||||
entry["content"] = content_parts
|
||||
if role == "assistant" and message.get("tool_calls"):
|
||||
entry["tool_calls"] = message["tool_calls"]
|
||||
if role == "assistant" and message.get("reasoning_content"):
|
||||
entry["reasoning_content"] = message["reasoning_content"]
|
||||
if role == "tool":
|
||||
entry["tool_call_id"] = message.get("tool_call_id") or message.get("tool_name") or "tool"
|
||||
normalized.append(entry)
|
||||
@@ -729,10 +766,29 @@ class OllamaAgent:
|
||||
def _provider_label(self) -> str:
|
||||
if self.provider == "openai":
|
||||
return "OpenAI model"
|
||||
if self.provider == "deepseek":
|
||||
return "DeepSeek model"
|
||||
if self.provider == "codex":
|
||||
return "Codex model"
|
||||
return "local model"
|
||||
|
||||
def _is_openai_compatible_provider(self) -> bool:
|
||||
return self.provider in {"openai", "deepseek"}
|
||||
|
||||
def _tool_rounds(self):
|
||||
if self.provider == "deepseek":
|
||||
while True:
|
||||
yield None
|
||||
return
|
||||
for _ in range(10):
|
||||
yield None
|
||||
|
||||
def _tool_round_limit_message(self) -> str:
|
||||
return "I hit the tool-call limit while working on that. Try narrowing the request or approve any pending action first."
|
||||
|
||||
def _wake_tool_round_limit_message(self) -> str:
|
||||
return "I hit the tool-call limit while running this scheduled wake job. Check the job prompt or pending approvals."
|
||||
|
||||
@staticmethod
|
||||
def _merge_openai_tool_call(target: dict[int, dict[str, Any]], delta: dict[str, Any]) -> None:
|
||||
index = int(delta.get("index") or 0)
|
||||
@@ -1175,20 +1231,21 @@ class OllamaAgent:
|
||||
models.append(slug)
|
||||
return sorted(set(models))
|
||||
|
||||
def _runtime_context(
|
||||
def _runtime_context_parts(
|
||||
self,
|
||||
query: str,
|
||||
previous_interaction: dict[str, Any] | None = None,
|
||||
thread_id: str | None = DEFAULT_THREAD_ID,
|
||||
attached_image_count: int = 0,
|
||||
) -> str:
|
||||
) -> tuple[list[str], list[str]]:
|
||||
local_zone = get_localzone()
|
||||
parts = [
|
||||
stable_parts: list[str] = []
|
||||
volatile_parts = [
|
||||
f"Current local date/time: {iso_now()} UTC; {iso_now_in_zone(local_zone)} {local_zone}.",
|
||||
]
|
||||
if attached_image_count:
|
||||
label = "image" if attached_image_count == 1 else "images"
|
||||
parts.append(
|
||||
volatile_parts.append(
|
||||
f"Current user message includes {attached_image_count} pasted {label}. "
|
||||
"You can inspect them visually. If the user wants one reused in a marketplace listing draft, "
|
||||
"call draft_marketplace_listing or draft_marketplace_listing_with_cornerstone_image with "
|
||||
@@ -1202,34 +1259,34 @@ class OllamaAgent:
|
||||
if uex.bearer_token:
|
||||
auth_methods.append("bearer token")
|
||||
if auth_methods:
|
||||
parts.append(
|
||||
stable_parts.append(
|
||||
"UEX API authentication is configured server-side with "
|
||||
+ " and ".join(auth_methods)
|
||||
+ "; use authenticated UEX tools directly and do not ask for tokens."
|
||||
)
|
||||
else:
|
||||
parts.append("UEX API authentication is not configured server-side.")
|
||||
stable_parts.append("UEX API authentication is not configured server-side.")
|
||||
if self.user_name:
|
||||
parts.append(f"Known user name/handle: {self.user_name}.")
|
||||
stable_parts.append(f"Known user name/handle: {self.user_name}.")
|
||||
|
||||
if self.memory is None:
|
||||
return "\n".join(parts)
|
||||
return stable_parts, volatile_parts
|
||||
|
||||
profile = self.memory.get_profile()
|
||||
if profile:
|
||||
identity = self._profile_identity(profile)
|
||||
if identity:
|
||||
parts.append(identity)
|
||||
parts.append(f"Known user profile JSON: {json.dumps(self._profile_for_prompt(profile), ensure_ascii=True)}.")
|
||||
stable_parts.append(identity)
|
||||
stable_parts.append(f"Known user profile JSON: {json.dumps(self._profile_for_prompt(profile), ensure_ascii=True)}.")
|
||||
|
||||
last = previous_interaction if previous_interaction is not None else self.memory.last_interaction(thread_id)
|
||||
if last:
|
||||
parts.append(
|
||||
volatile_parts.append(
|
||||
f"Previous interaction before this message: {last['created_at']} "
|
||||
f"({time_since(last['created_at'])}, role {last['role']})."
|
||||
)
|
||||
else:
|
||||
parts.append("Previous interaction before this message: none recorded.")
|
||||
volatile_parts.append("Previous interaction before this message: none recorded.")
|
||||
|
||||
memories = self.memory.recall(query, limit=6)
|
||||
if memories:
|
||||
@@ -1237,17 +1294,24 @@ class OllamaAgent:
|
||||
f"- [{item['kind']}, importance {item['importance']}] {item['content']}"
|
||||
for item in memories
|
||||
)
|
||||
parts.append(f"Relevant long-term memories:\n{memory_text}")
|
||||
volatile_parts.append(f"Relevant long-term memories:\n{memory_text}")
|
||||
|
||||
recent = self.memory.recent_conversation(limit=6, thread_id=thread_id)
|
||||
if recent:
|
||||
recent_text = "\n".join(
|
||||
f"- {item['created_at']} {item['role']}: {item['content'][:500]}"
|
||||
for item in recent
|
||||
)
|
||||
parts.append(f"Recent conversation excerpts from this chat:\n{recent_text}")
|
||||
return stable_parts, volatile_parts
|
||||
|
||||
return "\n".join(parts)
|
||||
def _runtime_context(
|
||||
self,
|
||||
query: str,
|
||||
previous_interaction: dict[str, Any] | None = None,
|
||||
thread_id: str | None = DEFAULT_THREAD_ID,
|
||||
attached_image_count: int = 0,
|
||||
) -> str:
|
||||
stable_parts, volatile_parts = self._runtime_context_parts(
|
||||
query,
|
||||
previous_interaction=previous_interaction,
|
||||
thread_id=thread_id,
|
||||
attached_image_count=attached_image_count,
|
||||
)
|
||||
return "\n".join(part for part in ("\n".join(stable_parts), "\n".join(volatile_parts)) if part)
|
||||
|
||||
def _messages_for_thread(self, thread_id: str | None) -> list[dict[str, Any]]:
|
||||
resolved_thread_id = self._thread_id(thread_id)
|
||||
@@ -1283,7 +1347,7 @@ class OllamaAgent:
|
||||
f"Message: {first_message[:800]}"
|
||||
)
|
||||
try:
|
||||
if self.provider == "openai":
|
||||
if self._is_openai_compatible_provider():
|
||||
async with httpx.AsyncClient(timeout=20) as client:
|
||||
response = await client.post(
|
||||
f"{self.base_url}/chat/completions",
|
||||
@@ -1295,6 +1359,7 @@ class OllamaAgent:
|
||||
{"role": "user", "content": prompt},
|
||||
],
|
||||
"stream": False,
|
||||
**self._openai_request_options(stream=False),
|
||||
},
|
||||
)
|
||||
response.raise_for_status()
|
||||
@@ -1330,6 +1395,34 @@ class OllamaAgent:
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
async def generate_plan_draft(
|
||||
self,
|
||||
title: str = "",
|
||||
objective: str = "",
|
||||
kind: str = "buying",
|
||||
constraints: dict[str, Any] | None = None,
|
||||
items: list[dict[str, Any]] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
clean_title = str(title or "").strip()
|
||||
clean_objective = str(objective or "").strip()
|
||||
clean_kind = str(kind or "buying").strip().casefold() or "buying"
|
||||
clean_constraints = dict(constraints or {})
|
||||
clean_items = self._normalize_plan_items(items or [])
|
||||
seed = {
|
||||
"title": clean_title,
|
||||
"objective": clean_objective,
|
||||
"kind": clean_kind,
|
||||
"constraints": clean_constraints,
|
||||
"items": clean_items,
|
||||
}
|
||||
prompt = self._plan_draft_prompt(seed)
|
||||
fallback = self._heuristic_plan_draft(seed)
|
||||
try:
|
||||
payload = await self._generate_plain_text(prompt, system_prompt="You draft structured continual plan JSON for TraderAI.")
|
||||
return self._normalize_plan_draft(payload, seed, fallback)
|
||||
except Exception:
|
||||
return fallback
|
||||
|
||||
@staticmethod
|
||||
def _thread_id(thread_id: str | None) -> str:
|
||||
return (thread_id or DEFAULT_THREAD_ID).strip() or DEFAULT_THREAD_ID
|
||||
@@ -1346,6 +1439,254 @@ class OllamaAgent:
|
||||
text = " ".join(words[:8])
|
||||
return text[:64]
|
||||
|
||||
async def _generate_plain_text(self, prompt: str, system_prompt: str) -> str:
|
||||
if self._is_openai_compatible_provider():
|
||||
async with httpx.AsyncClient(timeout=30) as client:
|
||||
response = await client.post(
|
||||
f"{self.base_url}/chat/completions",
|
||||
headers=self._openai_headers(),
|
||||
json={
|
||||
"model": self.model,
|
||||
"messages": [
|
||||
{"role": "system", "content": system_prompt},
|
||||
{"role": "user", "content": prompt},
|
||||
],
|
||||
"stream": False,
|
||||
**self._openai_request_options(stream=False),
|
||||
},
|
||||
)
|
||||
response.raise_for_status()
|
||||
choice = (response.json().get("choices") or [{}])[0]
|
||||
message = choice.get("message") or {}
|
||||
return str(message.get("content") or "")
|
||||
if self.provider == "codex":
|
||||
result = await self._codex_app_server_turn(
|
||||
prompt,
|
||||
[
|
||||
{"role": "system", "content": system_prompt},
|
||||
{"role": "user", "content": prompt},
|
||||
],
|
||||
thread_id="plan-draft",
|
||||
)
|
||||
return str(result.get("message") or "")
|
||||
async with httpx.AsyncClient(timeout=30) as client:
|
||||
response = await client.post(
|
||||
f"{self.base_url}/api/chat",
|
||||
json={
|
||||
"model": self.model,
|
||||
"messages": [
|
||||
{"role": "system", "content": system_prompt},
|
||||
{"role": "user", "content": prompt},
|
||||
],
|
||||
"options": self._ollama_options(),
|
||||
"stream": False,
|
||||
},
|
||||
)
|
||||
response.raise_for_status()
|
||||
message = response.json().get("message") or {}
|
||||
return str(message.get("content") or "")
|
||||
|
||||
@classmethod
|
||||
def _normalize_plan_draft(
|
||||
cls,
|
||||
raw_text: str,
|
||||
seed: dict[str, Any],
|
||||
fallback: dict[str, Any] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
base = dict(fallback or cls._heuristic_plan_draft(seed))
|
||||
payload = cls._parse_json_object(raw_text)
|
||||
if not isinstance(payload, dict):
|
||||
return base
|
||||
|
||||
title = str(payload.get("title") or seed.get("title") or base.get("title") or "").strip()
|
||||
objective = str(payload.get("objective") or seed.get("objective") or base.get("objective") or "").strip()
|
||||
kind = str(payload.get("kind") or seed.get("kind") or base.get("kind") or "buying").strip().casefold() or "buying"
|
||||
cadence = cls._normalize_plan_cadence(payload.get("cadence")) or base.get("cadence")
|
||||
constraints = cls._normalize_plan_constraints(payload.get("constraints"), seed.get("constraints") or {}, base.get("constraints") or {})
|
||||
items = cls._normalize_plan_items(payload.get("items") or seed.get("items") or base.get("items") or [])
|
||||
|
||||
if kind == "buying" and not items:
|
||||
items = list(base.get("items") or [])
|
||||
if not constraints.get("instructions"):
|
||||
constraints["instructions"] = (base.get("constraints") or {}).get("instructions") or cls._default_plan_instructions(kind)
|
||||
if not constraints.get("message_tone"):
|
||||
constraints["message_tone"] = (base.get("constraints") or {}).get("message_tone") or "friendly and direct"
|
||||
|
||||
return {
|
||||
"title": title or base.get("title") or "Continual plan",
|
||||
"objective": objective or base.get("objective") or title or "Continue this plan",
|
||||
"kind": kind,
|
||||
"cadence": cadence,
|
||||
"constraints": constraints,
|
||||
"items": items,
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def _heuristic_plan_draft(cls, seed: dict[str, Any]) -> dict[str, Any]:
|
||||
title = str(seed.get("title") or "").strip()
|
||||
objective = str(seed.get("objective") or "").strip()
|
||||
kind = str(seed.get("kind") or "buying").strip().casefold() or "buying"
|
||||
constraints = cls._normalize_plan_constraints(seed.get("constraints"), {}, {})
|
||||
items = cls._normalize_plan_items(seed.get("items") or [])
|
||||
|
||||
if not items and kind == "buying":
|
||||
inferred_names = cls._infer_item_names(f"{title}\n{objective}")
|
||||
items = [{"item_name": name, "desired_quantity": 1, "max_unit_price": None} for name in inferred_names[:8]]
|
||||
|
||||
if not constraints.get("message_tone"):
|
||||
constraints["message_tone"] = "friendly and direct"
|
||||
if not constraints.get("instructions"):
|
||||
constraints["instructions"] = cls._default_plan_instructions(kind)
|
||||
|
||||
return {
|
||||
"title": title or "Continual plan",
|
||||
"objective": objective or title or "Continue this plan",
|
||||
"kind": kind,
|
||||
"cadence": cls._normalize_plan_cadence(seed.get("cadence")) or ("0 */6 * * *" if kind == "buying" else "0 */4 * * *"),
|
||||
"constraints": constraints,
|
||||
"items": items,
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _default_plan_instructions(kind: str) -> str:
|
||||
if kind == "custom":
|
||||
return "Check for meaningful updates, summarize what changed, and suggest the next move."
|
||||
return "Track the best active listings, avoid bad prices, and draft messages for approval when a strong candidate appears."
|
||||
|
||||
@staticmethod
|
||||
def _plan_draft_prompt(seed: dict[str, Any]) -> str:
|
||||
return (
|
||||
"Draft a continual TraderAI plan as strict JSON.\n"
|
||||
"Return one JSON object only with keys: title, objective, kind, cadence, constraints, items.\n"
|
||||
"constraints may include message_tone, instructions, preferred_locations, excluded_sellers, max_unit_price.\n"
|
||||
"items must be an array of objects with item_name, desired_quantity, max_unit_price.\n"
|
||||
"If the request is vague, still fill cadence, message_tone, and instructions.\n"
|
||||
"Only include checklist items when they can be reasonably inferred from the request or existing draft.\n"
|
||||
"Do not wrap the JSON in markdown.\n\n"
|
||||
f"Current draft seed: {json.dumps(seed, ensure_ascii=True)}"
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _parse_json_object(raw_text: str) -> dict[str, Any] | None:
|
||||
text = str(raw_text or "").strip()
|
||||
if not text:
|
||||
return None
|
||||
try:
|
||||
parsed = json.loads(text)
|
||||
return parsed if isinstance(parsed, dict) else None
|
||||
except ValueError:
|
||||
pass
|
||||
start = text.find("{")
|
||||
end = text.rfind("}")
|
||||
if start == -1 or end <= start:
|
||||
return None
|
||||
try:
|
||||
parsed = json.loads(text[start : end + 1])
|
||||
return parsed if isinstance(parsed, dict) else None
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def _normalize_plan_constraints(cls, value: Any, seed: dict[str, Any], fallback: dict[str, Any]) -> dict[str, Any]:
|
||||
merged: dict[str, Any] = {}
|
||||
for source in (fallback, seed, value if isinstance(value, dict) else {}):
|
||||
if not isinstance(source, dict):
|
||||
continue
|
||||
for key, item in source.items():
|
||||
if item in (None, "", [], {}):
|
||||
continue
|
||||
if key in {"preferred_locations", "excluded_sellers"}:
|
||||
if isinstance(item, list):
|
||||
merged[key] = [str(entry).strip() for entry in item if str(entry).strip()]
|
||||
elif key == "max_unit_price":
|
||||
try:
|
||||
merged[key] = float(item)
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
else:
|
||||
merged[key] = str(item).strip()
|
||||
return merged
|
||||
|
||||
@staticmethod
|
||||
def _normalize_plan_cadence(value: Any) -> str | None:
|
||||
text = str(value or "").strip()
|
||||
if not text:
|
||||
return None
|
||||
parts = text.split()
|
||||
return text if len(parts) == 5 else None
|
||||
|
||||
@classmethod
|
||||
def _normalize_plan_items(cls, items: Any) -> list[dict[str, Any]]:
|
||||
if not isinstance(items, list):
|
||||
return []
|
||||
normalized: list[dict[str, Any]] = []
|
||||
for item in items:
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
name = str(item.get("item_name") or item.get("name") or "").strip()
|
||||
if not name:
|
||||
continue
|
||||
normalized_item: dict[str, Any] = {"item_name": name}
|
||||
try:
|
||||
normalized_item["desired_quantity"] = max(1, int(item.get("desired_quantity") or item.get("quantity") or 1))
|
||||
except (TypeError, ValueError):
|
||||
normalized_item["desired_quantity"] = 1
|
||||
try:
|
||||
if item.get("max_unit_price") not in (None, ""):
|
||||
normalized_item["max_unit_price"] = float(item.get("max_unit_price"))
|
||||
elif item.get("max_price") not in (None, ""):
|
||||
normalized_item["max_unit_price"] = float(item.get("max_price"))
|
||||
else:
|
||||
normalized_item["max_unit_price"] = None
|
||||
except (TypeError, ValueError):
|
||||
normalized_item["max_unit_price"] = None
|
||||
normalized.append(normalized_item)
|
||||
return normalized
|
||||
|
||||
@staticmethod
|
||||
def _infer_item_names(text: str) -> list[str]:
|
||||
source = str(text or "")
|
||||
quoted = [match.strip() for match in re.findall(r'"([^"\n]{2,80})"|\'([^\'\n]{2,80})\'', source)]
|
||||
names = [next((part for part in group if part), "") for group in quoted]
|
||||
if names:
|
||||
return [name for name in names if name]
|
||||
|
||||
lines = []
|
||||
for raw_line in source.splitlines():
|
||||
line = raw_line.strip(" -*\t")
|
||||
if not line:
|
||||
continue
|
||||
if any(token in line for token in [",", ";", "/"]):
|
||||
parts = re.split(r"[,;/]+", line)
|
||||
lines.extend(part.strip() for part in parts if part.strip())
|
||||
else:
|
||||
lines.append(line)
|
||||
|
||||
stopwords = {
|
||||
"need", "needs", "want", "wants", "find", "draft", "deal", "deals", "parts", "part", "items",
|
||||
"watch", "track", "check", "buy", "buying", "for", "the", "and", "with", "from", "best", "cheapest",
|
||||
}
|
||||
inferred = []
|
||||
for line in lines:
|
||||
clean = re.sub(r"\s+", " ", line).strip().strip(".")
|
||||
if len(clean) < 3:
|
||||
continue
|
||||
lowered = clean.casefold()
|
||||
if lowered in stopwords:
|
||||
continue
|
||||
if any(phrase in lowered for phrase in ["find and draft", "check for", "continue this plan"]):
|
||||
continue
|
||||
inferred.append(clean[:120])
|
||||
deduped = []
|
||||
seen = set()
|
||||
for item in inferred:
|
||||
key = item.casefold()
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
deduped.append(item)
|
||||
return deduped
|
||||
|
||||
def _pending_payloads(self) -> list[dict[str, Any]]:
|
||||
return [
|
||||
{
|
||||
@@ -1405,6 +1746,8 @@ class OllamaAgent:
|
||||
"get_scwiki_page": "Reading Star Citizen Wiki page",
|
||||
"search_scwiki_vehicles": "Searching Star Citizen Wiki vehicles",
|
||||
"get_scwiki_vehicle": "Fetching Star Citizen Wiki vehicle",
|
||||
"search_wikelo_ship_projects": "Searching Wikelo ship projects",
|
||||
"get_wikelo_ship_project": "Fetching Wikelo ship requirements",
|
||||
"search_cornerstone_items": "Searching Cornerstone items",
|
||||
"get_cornerstone_item_locations": "Fetching Cornerstone item locations",
|
||||
"get_cornerstone_item_media": "Fetching Cornerstone item media",
|
||||
@@ -1442,6 +1785,21 @@ class OllamaAgent:
|
||||
"writing_tokens_per_second": rate(output_tokens, output_duration),
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _cloud_usage_metrics(usage: dict[str, Any]) -> dict[str, Any]:
|
||||
prompt_tokens = int(usage.get("prompt_tokens") or 0)
|
||||
completion_tokens = int(usage.get("completion_tokens") or 0)
|
||||
cache_hit_tokens = int(usage.get("prompt_cache_hit_tokens") or 0)
|
||||
cache_miss_tokens = int(usage.get("prompt_cache_miss_tokens") or 0)
|
||||
metrics = {
|
||||
"reading_tokens": prompt_tokens,
|
||||
"writing_tokens": completion_tokens,
|
||||
}
|
||||
if cache_hit_tokens or cache_miss_tokens:
|
||||
metrics["cache_hit_tokens"] = cache_hit_tokens
|
||||
metrics["cache_miss_tokens"] = cache_miss_tokens
|
||||
return metrics
|
||||
|
||||
@staticmethod
|
||||
def _profile_identity(profile: dict[str, Any]) -> str:
|
||||
user = profile.get("uex_user")
|
||||
|
||||
+11
-5
@@ -17,6 +17,8 @@ CONFIG_FIELDS: dict[str, dict[str, Any]] = {
|
||||
"ollama_num_ctx": {"env": "OLLAMA_NUM_CTX", "type": "integer", "secret": False},
|
||||
"openai_base_url": {"env": "OPENAI_BASE_URL", "type": "string", "secret": False},
|
||||
"openai_model": {"env": "OPENAI_MODEL", "type": "string", "secret": False},
|
||||
"deepseek_base_url": {"env": "DEEPSEEK_BASE_URL", "type": "string", "secret": False},
|
||||
"deepseek_model": {"env": "DEEPSEEK_MODEL", "type": "string", "secret": False},
|
||||
"model_reasoning_effort": {"env": "MODEL_REASONING_EFFORT", "type": "string", "secret": False},
|
||||
"codex_command": {"env": "CODEX_COMMAND", "type": "string", "secret": False},
|
||||
"codex_model": {"env": "CODEX_MODEL", "type": "string", "secret": False},
|
||||
@@ -26,6 +28,7 @@ CONFIG_FIELDS: dict[str, dict[str, Any]] = {
|
||||
"scwiki_base_url": {"env": "SCWIKI_BASE_URL", "type": "string", "secret": False},
|
||||
"scwiki_api_base_url": {"env": "SCWIKI_API_BASE_URL", "type": "string", "secret": False},
|
||||
"openai_api_key": {"env": "OPENAI_API_KEY", "type": "string", "secret": True},
|
||||
"deepseek_api_key": {"env": "DEEPSEEK_API_KEY", "type": "string", "secret": True},
|
||||
"uex_secret_key": {"env": "UEX_SECRET_KEY", "type": "string", "secret": True},
|
||||
"uex_bearer_token": {"env": "UEX_BEARER_TOKEN", "type": "string", "secret": True},
|
||||
"traderai_user_name": {"env": "TRADERAI_USER_NAME", "type": "string", "secret": False},
|
||||
@@ -77,6 +80,8 @@ class Settings(BaseSettings):
|
||||
ollama_num_ctx: int = 64512
|
||||
openai_base_url: str = "https://api.openai.com/v1"
|
||||
openai_model: str = "gpt-5.4-mini"
|
||||
deepseek_base_url: str = "https://api.deepseek.com"
|
||||
deepseek_model: str = "deepseek-v4-flash"
|
||||
model_reasoning_effort: str = "medium"
|
||||
codex_command: str = "codex"
|
||||
codex_model: str = "gpt-5.4"
|
||||
@@ -86,14 +91,15 @@ class Settings(BaseSettings):
|
||||
scwiki_base_url: str = "https://starcitizen.tools"
|
||||
scwiki_api_base_url: str = "https://api.star-citizen.wiki"
|
||||
openai_api_key: str | None = Field(default=None)
|
||||
deepseek_api_key: str | None = Field(default=None)
|
||||
uex_secret_key: str | None = Field(default=None)
|
||||
uex_bearer_token: str | None = Field(default=None)
|
||||
traderai_user_name: str | None = Field(default=None)
|
||||
traderai_memory_path: str = Field(default_factory=lambda: str(default_memory_path()))
|
||||
uex_notification_poll_seconds: int = 60
|
||||
uex_notification_poll_seconds: int = 300
|
||||
require_write_approval: bool = True
|
||||
|
||||
@field_validator("openai_api_key", "uex_secret_key", "uex_bearer_token", "traderai_user_name", mode="before")
|
||||
@field_validator("openai_api_key", "deepseek_api_key", "uex_secret_key", "uex_bearer_token", "traderai_user_name", mode="before")
|
||||
@classmethod
|
||||
def _blank_optional(cls, value: Any) -> Any:
|
||||
return None if value == "" else value
|
||||
@@ -102,13 +108,13 @@ class Settings(BaseSettings):
|
||||
@classmethod
|
||||
def _normalize_model_provider(cls, value: Any) -> str:
|
||||
text = str(value or "ollama").strip().casefold()
|
||||
return text if text in {"ollama", "openai", "codex"} else "ollama"
|
||||
return text if text in {"ollama", "deepseek"} else "ollama"
|
||||
|
||||
@field_validator("model_reasoning_effort", mode="before")
|
||||
@classmethod
|
||||
def _normalize_reasoning_effort(cls, value: Any) -> str:
|
||||
text = str(value or "medium").strip().casefold()
|
||||
return text if text in {"none", "minimal", "low", "medium", "high", "xhigh"} else "medium"
|
||||
return text if text in {"none", "minimal", "low", "medium", "high", "xhigh", "max"} else "medium"
|
||||
|
||||
@field_validator("traderai_memory_path", mode="before")
|
||||
@classmethod
|
||||
@@ -167,7 +173,7 @@ def save_settings(values: dict[str, Any]) -> dict[str, Any]:
|
||||
def _coerce_value(key: str, value: Any) -> Any:
|
||||
field_type = CONFIG_FIELDS[key]["type"]
|
||||
if value == "":
|
||||
return None if key in {"openai_api_key", "uex_secret_key", "uex_bearer_token", "traderai_user_name"} else ""
|
||||
return None if key in {"openai_api_key", "deepseek_api_key", "uex_secret_key", "uex_bearer_token", "traderai_user_name"} else ""
|
||||
if field_type == "integer":
|
||||
return int(value)
|
||||
if field_type == "boolean":
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ def _plural(value: int, unit: str) -> str:
|
||||
|
||||
class MemoryStore:
|
||||
def __init__(self, path: str) -> None:
|
||||
self.path = Path(path)
|
||||
self.path = Path(path).expanduser().resolve()
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
self._init_db()
|
||||
|
||||
|
||||
+18
-5
@@ -528,12 +528,13 @@ class ContinualPlanRunner:
|
||||
|
||||
async def _draft_buying_message(self, plan: dict[str, Any], item: dict[str, Any], candidate: dict[str, Any]) -> dict[str, Any]:
|
||||
tone = (plan.get("constraints") or {}).get("message_tone") or "polite and concise"
|
||||
greeting = "Hi" if "professional" in str(tone).casefold() or "polite" in str(tone).casefold() else "Hey"
|
||||
build_context = self._plan_build_context(plan["objective"])
|
||||
message = (
|
||||
f"Hi, I am interested in your {candidate.get('title') or item['item_name']} listing "
|
||||
f"for {self._format_price(candidate.get('price'), candidate.get('currency'))}. "
|
||||
f"Is it still available? I am trying to complete: {plan['objective']}. "
|
||||
f"Tone note: {tone}."
|
||||
)
|
||||
f"{greeting}, is your {candidate.get('title') or item['item_name']} listing still available "
|
||||
f"for {self._format_price(candidate.get('price'), candidate.get('currency'))}? "
|
||||
f"{build_context}If you still have it, I can move quickly."
|
||||
).strip()
|
||||
return await self.tools.draft_negotiation_message(
|
||||
message=message,
|
||||
id_listing=self._int_or_none(candidate.get("listing_id")),
|
||||
@@ -543,6 +544,18 @@ class ContinualPlanRunner:
|
||||
listing_slug=candidate.get("listing_slug"),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _plan_build_context(objective: str) -> str:
|
||||
text = str(objective or "").strip().rstrip(".")
|
||||
if not text:
|
||||
return ""
|
||||
lowered = text.casefold()
|
||||
if "polaris" in lowered:
|
||||
return "I'm putting together parts for a Polaris build. "
|
||||
if "mission" in lowered:
|
||||
return "I'm trying to wrap up a mission build. "
|
||||
return "I'm sourcing parts for a build. "
|
||||
|
||||
@staticmethod
|
||||
def _candidate_score(listing: dict[str, Any], item: dict[str, Any], preferred_locations: list[str]) -> float:
|
||||
price = float(listing.get("price") or 10**12)
|
||||
|
||||
+68
-5
@@ -31,6 +31,7 @@ from traderai.starcitizen_wiki_client import StarCitizenWikiClient
|
||||
from traderai.tools import ToolRegistry
|
||||
from traderai.uex_client import UEXClient
|
||||
from traderai.version import RELEASES_API_URL, RELEASES_URL, __version__
|
||||
from traderai.wikelo_projects_client import WikeloProjectsClient
|
||||
|
||||
|
||||
def resource_path(*parts: str) -> Path:
|
||||
@@ -85,6 +86,14 @@ class ContinualPlanCreateRequest(BaseModel):
|
||||
items: list[ContinualPlanItemRequest] = []
|
||||
|
||||
|
||||
class ContinualPlanDraftRequest(BaseModel):
|
||||
title: str = ""
|
||||
objective: str = ""
|
||||
kind: str = "buying"
|
||||
constraints: dict[str, Any] = {}
|
||||
items: list[ContinualPlanItemRequest] = []
|
||||
|
||||
|
||||
class ContinualPlanEventRequest(BaseModel):
|
||||
kind: str = "note"
|
||||
message: str
|
||||
@@ -115,6 +124,7 @@ def create_app() -> FastAPI:
|
||||
scmdb = SCMDBClient(current_settings.scmdb_base_url)
|
||||
cornerstone = CornerstoneClient(current_settings.cornerstone_base_url)
|
||||
scwiki = StarCitizenWikiClient(current_settings.scwiki_base_url, current_settings.scwiki_api_base_url)
|
||||
wikelo = WikeloProjectsClient()
|
||||
tools = ToolRegistry(
|
||||
uex,
|
||||
current_settings.require_write_approval,
|
||||
@@ -123,6 +133,7 @@ def create_app() -> FastAPI:
|
||||
scmdb=scmdb,
|
||||
cornerstone=cornerstone,
|
||||
scwiki=scwiki,
|
||||
wikelo=wikelo,
|
||||
plan_store=plan_store,
|
||||
)
|
||||
plan_runner = ContinualPlanRunner(plan_store, tools, memory)
|
||||
@@ -493,6 +504,18 @@ def create_app() -> FastAPI:
|
||||
raise HTTPException(status_code=400, detail=result["error"])
|
||||
return result
|
||||
|
||||
@app.post("/api/plans/draft")
|
||||
async def draft_continual_plan(request: ContinualPlanDraftRequest) -> dict:
|
||||
agent = runtime["agent"]
|
||||
draft = await agent.generate_plan_draft(
|
||||
title=request.title,
|
||||
objective=request.objective,
|
||||
kind=request.kind,
|
||||
constraints=request.constraints,
|
||||
items=[item.model_dump() for item in request.items],
|
||||
)
|
||||
return {"draft": draft}
|
||||
|
||||
@app.get("/api/plans/{plan_id}")
|
||||
async def continual_plan(plan_id: str) -> dict:
|
||||
plan = plan_store.get_plan(plan_id)
|
||||
@@ -592,6 +615,8 @@ async def inspect_model_provider() -> dict[str, Any]:
|
||||
settings = get_settings()
|
||||
if settings.model_provider == "openai":
|
||||
return await inspect_openai()
|
||||
if settings.model_provider == "deepseek":
|
||||
return await inspect_deepseek()
|
||||
if settings.model_provider == "codex":
|
||||
return await inspect_codex()
|
||||
return await inspect_ollama()
|
||||
@@ -602,6 +627,16 @@ async def inspect_openai() -> dict[str, Any]:
|
||||
return await inspect_cloud_provider_config("openai", settings.openai_base_url, settings.openai_api_key, settings.openai_model)
|
||||
|
||||
|
||||
async def inspect_deepseek() -> dict[str, Any]:
|
||||
settings = get_settings()
|
||||
return await inspect_cloud_provider_config(
|
||||
"deepseek",
|
||||
settings.deepseek_base_url,
|
||||
settings.deepseek_api_key,
|
||||
settings.deepseek_model,
|
||||
)
|
||||
|
||||
|
||||
async def inspect_codex() -> dict[str, Any]:
|
||||
settings = get_settings()
|
||||
command = find_codex_cli(settings.codex_command)
|
||||
@@ -638,6 +673,8 @@ async def inspect_cloud_provider() -> dict[str, Any]:
|
||||
settings = get_settings()
|
||||
if settings.model_provider == "codex":
|
||||
return await inspect_codex()
|
||||
if settings.model_provider == "deepseek":
|
||||
return await inspect_deepseek()
|
||||
return await inspect_openai()
|
||||
|
||||
|
||||
@@ -647,6 +684,8 @@ async def inspect_provider_models(provider: str | None = None) -> dict[str, Any]
|
||||
return await inspect_codex()
|
||||
if normalized == "ollama":
|
||||
return await inspect_ollama()
|
||||
if normalized == "deepseek":
|
||||
return await inspect_deepseek()
|
||||
return await inspect_openai()
|
||||
|
||||
|
||||
@@ -669,8 +708,8 @@ async def inspect_cloud_provider_config(
|
||||
"provider": provider,
|
||||
"model_available": False,
|
||||
"configured_model": model,
|
||||
"configured_reasoning_effort": settings.model_reasoning_effort,
|
||||
"reasoning_efforts": reasoning_effort_options(),
|
||||
"configured_reasoning_effort": canonical_provider_reasoning_effort(provider, settings.model_reasoning_effort),
|
||||
"reasoning_efforts": provider_reasoning_efforts(provider, model),
|
||||
"base_url": base_url,
|
||||
"models": [],
|
||||
"message": f"{provider_name} is selected, but no API key is configured.",
|
||||
@@ -698,8 +737,8 @@ async def inspect_cloud_provider_config(
|
||||
"provider": provider,
|
||||
"model_available": model_available,
|
||||
"configured_model": model,
|
||||
"configured_reasoning_effort": settings.model_reasoning_effort,
|
||||
"reasoning_efforts": reasoning_effort_options(),
|
||||
"configured_reasoning_effort": canonical_provider_reasoning_effort(provider, settings.model_reasoning_effort),
|
||||
"reasoning_efforts": provider_reasoning_efforts(provider, model),
|
||||
"base_url": base_url,
|
||||
"models": models,
|
||||
"message": cloud_status_message(provider, online, bool(api_key), model_available, model),
|
||||
@@ -783,13 +822,15 @@ def codex_status_message(installed: bool, logged_in: bool, model_available: bool
|
||||
def provider_settings(settings: Any) -> tuple[str, str, str | None]:
|
||||
if settings.model_provider == "openai":
|
||||
return settings.openai_base_url, settings.openai_model, settings.openai_api_key
|
||||
if settings.model_provider == "deepseek":
|
||||
return settings.deepseek_base_url, settings.deepseek_model, settings.deepseek_api_key
|
||||
if settings.model_provider == "codex":
|
||||
return settings.codex_command, settings.codex_model, None
|
||||
return settings.ollama_base_url, settings.ollama_model, None
|
||||
|
||||
|
||||
def provider_display_name(provider: str) -> str:
|
||||
return {"openai": "OpenAI", "codex": "Codex"}.get(provider, "Ollama")
|
||||
return {"openai": "OpenAI", "deepseek": "DeepSeek", "codex": "Codex"}.get(provider, "Ollama")
|
||||
|
||||
|
||||
def find_codex_cli(configured_command: str | None = None) -> Path | None:
|
||||
@@ -1056,6 +1097,28 @@ def reasoning_effort_options() -> list[str]:
|
||||
return ["none", "minimal", "low", "medium", "high", "xhigh"]
|
||||
|
||||
|
||||
def deepseek_reasoning_efforts(model: str) -> list[str]:
|
||||
supported_models = {"deepseek-v4-flash", "deepseek-v4-pro", "deepseek-chat", "deepseek-reasoner"}
|
||||
return ["none", "high", "max"] if model in supported_models else ["none", "high"]
|
||||
|
||||
|
||||
def provider_reasoning_efforts(provider: str, model: str) -> list[str]:
|
||||
if provider == "deepseek":
|
||||
return deepseek_reasoning_efforts(model)
|
||||
return reasoning_effort_options()
|
||||
|
||||
|
||||
def canonical_provider_reasoning_effort(provider: str, effort: str) -> str:
|
||||
normalized = str(effort or "medium").strip().casefold()
|
||||
if provider != "deepseek":
|
||||
return normalized
|
||||
if normalized in {"none", "minimal"}:
|
||||
return "none"
|
||||
if normalized in {"xhigh", "max"}:
|
||||
return "max"
|
||||
return "high"
|
||||
|
||||
|
||||
def find_ollama_executable() -> Path | None:
|
||||
candidates = [
|
||||
shutil.which("ollama"),
|
||||
|
||||
@@ -12,6 +12,7 @@ from traderai.scheduler import WakeScheduler
|
||||
from traderai.scmdb_client import SCMDBClient
|
||||
from traderai.starcitizen_wiki_client import StarCitizenWikiClient
|
||||
from traderai.uex_client import UEXClient
|
||||
from traderai.wikelo_projects_client import WikeloProjectsClient
|
||||
|
||||
|
||||
ToolHandler = Callable[..., Awaitable[dict[str, Any]]]
|
||||
@@ -172,6 +173,7 @@ class ToolRegistry:
|
||||
scmdb: SCMDBClient | None = None,
|
||||
cornerstone: CornerstoneClient | None = None,
|
||||
scwiki: StarCitizenWikiClient | None = None,
|
||||
wikelo: WikeloProjectsClient | None = None,
|
||||
plan_store: Any | None = None,
|
||||
plan_runner: Any | None = None,
|
||||
) -> None:
|
||||
@@ -179,6 +181,7 @@ class ToolRegistry:
|
||||
self.scmdb = scmdb or SCMDBClient()
|
||||
self.cornerstone = cornerstone or CornerstoneClient()
|
||||
self.scwiki = scwiki or StarCitizenWikiClient()
|
||||
self.wikelo = wikelo or WikeloProjectsClient()
|
||||
self.require_write_approval = require_write_approval
|
||||
self.memory = memory
|
||||
self.scheduler = scheduler
|
||||
@@ -214,6 +217,8 @@ class ToolRegistry:
|
||||
"get_scwiki_page": self.get_scwiki_page,
|
||||
"search_scwiki_vehicles": self.search_scwiki_vehicles,
|
||||
"get_scwiki_vehicle": self.get_scwiki_vehicle,
|
||||
"search_wikelo_ship_projects": self.search_wikelo_ship_projects,
|
||||
"get_wikelo_ship_project": self.get_wikelo_ship_project,
|
||||
"search_cornerstone_items": self.search_cornerstone_items,
|
||||
"get_cornerstone_item_locations": self.get_cornerstone_item_locations,
|
||||
"get_cornerstone_item_media": self.get_cornerstone_item_media,
|
||||
@@ -244,6 +249,7 @@ class ToolRegistry:
|
||||
*self._uex_delete_schemas(),
|
||||
*self._scmdb_schemas(),
|
||||
*self._scwiki_schemas(),
|
||||
*self._wikelo_schemas(),
|
||||
*self._cornerstone_schemas(),
|
||||
{
|
||||
"type": "function",
|
||||
@@ -1071,6 +1077,39 @@ class ToolRegistry:
|
||||
},
|
||||
]
|
||||
|
||||
@classmethod
|
||||
def _wikelo_schemas(cls) -> list[dict[str, Any]]:
|
||||
return [
|
||||
{
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": "search_wikelo_ship_projects",
|
||||
"description": "Search Wikelo ship projects and their required materials from wikelo-projects.com. Use this when the user asks for Wikelo ship requirements or build materials.",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"query": {"type": "string", "description": "Ship or project name to search for, such as Polaris, Idris, Zeus, or Guardian."},
|
||||
"limit": {"type": "integer", "minimum": 1, "maximum": 10, "default": 5},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": "get_wikelo_ship_project",
|
||||
"description": "Fetch one Wikelo ship project with its required materials and contribution progress.",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"project_id": {"type": "string", "description": "Wikelo ship project id."},
|
||||
"ship_name": {"type": "string", "description": "Ship or project name if the project id is not known."},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
@classmethod
|
||||
def _cornerstone_schemas(cls) -> list[dict[str, Any]]:
|
||||
return [
|
||||
@@ -1740,6 +1779,51 @@ class ToolRegistry:
|
||||
vehicle = await self.scwiki.get_vehicle(resolved_slug)
|
||||
return {"source": self.scwiki.api_base_url, "vehicle": self._summarize_scwiki_vehicle(vehicle)}
|
||||
|
||||
async def search_wikelo_ship_projects(self, query: str, limit: int = 5) -> dict[str, Any]:
|
||||
projects = await self.wikelo.list_ship_projects()
|
||||
q = (query or "").casefold().strip()
|
||||
matches = []
|
||||
for project in projects:
|
||||
score = self._wikelo_ship_match_score(q, project)
|
||||
if q and score <= 0:
|
||||
continue
|
||||
matches.append((score, project))
|
||||
matches.sort(
|
||||
key=lambda match: (
|
||||
-match[0],
|
||||
str(match[1].get("ship_name") or "").casefold(),
|
||||
str(match[1].get("id") or ""),
|
||||
)
|
||||
)
|
||||
limit = max(1, min(limit, 10))
|
||||
return {
|
||||
"source": f"{self.wikelo.base_url}/Ships",
|
||||
"query": query,
|
||||
"matched": len(matches),
|
||||
"projects": [self._summarize_wikelo_ship_project(item) for _, item in matches[:limit]],
|
||||
}
|
||||
|
||||
async def get_wikelo_ship_project(self, project_id: str | None = None, ship_name: str | None = None) -> dict[str, Any]:
|
||||
projects = await self.wikelo.list_ship_projects()
|
||||
if project_id:
|
||||
for project in projects:
|
||||
if str(project.get("id") or "").strip() == str(project_id).strip():
|
||||
return {"source": f"{self.wikelo.base_url}/Ships", "project": self._summarize_wikelo_ship_project(project, detailed=True)}
|
||||
return {"error": "No Wikelo ship project matched that id."}
|
||||
|
||||
if not ship_name:
|
||||
return {"error": "Provide project_id or ship_name."}
|
||||
|
||||
ranked = [
|
||||
(self._wikelo_ship_match_score(ship_name.casefold().strip(), project), project)
|
||||
for project in projects
|
||||
]
|
||||
ranked = [match for match in ranked if match[0] > 0]
|
||||
ranked.sort(key=lambda match: (-match[0], str(match[1].get("ship_name") or "").casefold()))
|
||||
if not ranked:
|
||||
return {"error": "No Wikelo ship project matched."}
|
||||
return {"source": f"{self.wikelo.base_url}/Ships", "project": self._summarize_wikelo_ship_project(ranked[0][1], detailed=True)}
|
||||
|
||||
async def search_cornerstone_items(
|
||||
self,
|
||||
query: str = "",
|
||||
@@ -2492,6 +2576,62 @@ class ToolRegistry:
|
||||
"version": vehicle.get("version"),
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _wikelo_ship_match_score(query: str, project: dict[str, Any]) -> int:
|
||||
if not query:
|
||||
return 1
|
||||
ship_name = str(project.get("ship_name") or "").casefold()
|
||||
description = str(project.get("description") or "").casefold()
|
||||
materials = " ".join(
|
||||
str(item.get("material_name") or "").casefold()
|
||||
for item in (project.get("required_materials") or [])
|
||||
if isinstance(item, dict)
|
||||
)
|
||||
haystack = " ".join(part for part in [ship_name, description, materials] if part)
|
||||
if ship_name == query:
|
||||
return 10000
|
||||
if query in ship_name:
|
||||
return 9000 - ship_name.index(query)
|
||||
if query in description:
|
||||
return 7000 - description.index(query)
|
||||
if query in materials:
|
||||
return 5000 - materials.index(query)
|
||||
tokens = [token for token in query.split() if token]
|
||||
if tokens and all(token in haystack for token in tokens):
|
||||
return 3000 - len(haystack)
|
||||
return 0
|
||||
|
||||
@classmethod
|
||||
def _summarize_wikelo_ship_project(cls, project: dict[str, Any], detailed: bool = False) -> dict[str, Any]:
|
||||
materials = []
|
||||
for item in (project.get("required_materials") or []):
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
quantity_needed = item.get("quantity_needed")
|
||||
quantity_collected = item.get("quantity_collected")
|
||||
materials.append(
|
||||
{
|
||||
"material_name": item.get("material_name"),
|
||||
"quantity_needed": int(quantity_needed) if isinstance(quantity_needed, (int, float)) and float(quantity_needed).is_integer() else quantity_needed,
|
||||
"quantity_collected": int(quantity_collected) if isinstance(quantity_collected, (int, float)) and float(quantity_collected).is_integer() else quantity_collected,
|
||||
}
|
||||
)
|
||||
summary = {
|
||||
"id": project.get("id"),
|
||||
"ship_name": project.get("ship_name"),
|
||||
"description": project.get("description"),
|
||||
"status": project.get("status"),
|
||||
"privacy": project.get("privacy"),
|
||||
"owner_name": project.get("owner_name"),
|
||||
"org_name": project.get("org_name"),
|
||||
"home_port": project.get("home_port"),
|
||||
"ship_image": project.get("ship_image"),
|
||||
"materials_count": len(materials),
|
||||
"required_materials": materials if detailed else materials[:12],
|
||||
"source_url": f"https://wikelo-projects.com/Ships",
|
||||
}
|
||||
return {key: value for key, value in summary.items() if value not in (None, "", [], {})}
|
||||
|
||||
@classmethod
|
||||
def _summarize_negotiation(cls, negotiation: dict[str, Any]) -> dict[str, Any]:
|
||||
summary = cls._project_item(negotiation, mode="summary")
|
||||
|
||||
+3
-1
@@ -1,6 +1,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
__version__ = "0.0.6"
|
||||
__version__ = "0.0.8"
|
||||
|
||||
RELEASES_URL = "https://git.hudsonriggs.systems/LambdaBankingConglomerate/TraderAI/releases"
|
||||
RELEASES_API_URL = "https://git.hudsonriggs.systems/api/v1/repos/LambdaBankingConglomerate/TraderAI/releases"
|
||||
@@ -13,3 +13,5 @@ RELEASES_API_URL = "https://git.hudsonriggs.systems/api/v1/repos/LambdaBankingCo
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
import httpx
|
||||
|
||||
|
||||
class WikeloProjectsError(RuntimeError):
|
||||
pass
|
||||
|
||||
|
||||
class WikeloProjectsClient:
|
||||
APP_ID = "695be2905c0b4866dfb21265"
|
||||
|
||||
def __init__(self, base_url: str = "https://wikelo-projects.com") -> None:
|
||||
self.base_url = base_url.rstrip("/")
|
||||
|
||||
async def list_ship_projects(self) -> list[dict[str, Any]]:
|
||||
body = await self._get_json(f"{self.base_url}/api/apps/{self.APP_ID}/entities/ShipProject")
|
||||
if not isinstance(body, list):
|
||||
raise WikeloProjectsError("Wikelo ship projects response was not a list.")
|
||||
return [item for item in body if isinstance(item, dict)]
|
||||
|
||||
async def _get_json(self, url: str) -> Any:
|
||||
async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
|
||||
response = await client.get(url, headers={"Accept": "application/json"})
|
||||
try:
|
||||
body = response.json()
|
||||
except ValueError as exc:
|
||||
raise WikeloProjectsError(f"Wikelo Projects returned non-JSON response: HTTP {response.status_code}") from exc
|
||||
if response.status_code >= 400:
|
||||
raise WikeloProjectsError(f"Wikelo Projects HTTP {response.status_code}: {body}")
|
||||
return body
|
||||
File diff suppressed because one or more lines are too long
@@ -755,7 +755,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "traderai"
|
||||
version = "0.0.6"
|
||||
version = "0.0.8"
|
||||
source = { virtual = "." }
|
||||
dependencies = [
|
||||
{ name = "apscheduler" },
|
||||
@@ -1053,3 +1053,5 @@ wheels = [
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+115
-104
@@ -26,9 +26,8 @@ const ollamaDownloadButton = document.getElementById("ollama-download");
|
||||
const ollamaInstallButton = document.getElementById("ollama-install");
|
||||
const ollamaLaunchButton = document.getElementById("ollama-launch");
|
||||
const ollamaPullButton = document.getElementById("ollama-pull");
|
||||
const codexLoginButton = document.getElementById("codex-login");
|
||||
const openaiModelsRefreshButton = document.getElementById("openai-models-refresh");
|
||||
const providerModelSelect = document.getElementById("provider-model-select");
|
||||
const providerModelLabel = document.getElementById("provider-model-label");
|
||||
const modelReasoningEffortSelect = document.getElementById("model-reasoning-effort");
|
||||
const ollamaStatusEl = document.getElementById("ollama-status");
|
||||
const ollamaMessageEl = document.getElementById("ollama-message");
|
||||
@@ -57,6 +56,7 @@ const updateModalReleases = document.getElementById("update-modal-releases");
|
||||
const plansRefreshButton = document.getElementById("plans-refresh");
|
||||
const plansCloseButton = document.getElementById("plans-close");
|
||||
const planForm = document.getElementById("plan-form");
|
||||
const planAutofillButton = document.getElementById("plan-autofill");
|
||||
const plansStatusEl = document.getElementById("plans-status");
|
||||
const plansDashboardEl = document.getElementById("plans-dashboard");
|
||||
const plansRailListEl = document.getElementById("plans-rail-list");
|
||||
@@ -164,6 +164,8 @@ function appendThinkingText(node, text) {
|
||||
steps.appendChild(item);
|
||||
}
|
||||
item.textContent += text;
|
||||
const thinking = node.querySelector(".thinking-log");
|
||||
if (thinking && !thinking.open) thinking.open = true;
|
||||
}
|
||||
|
||||
function createThinkTagParser(node) {
|
||||
@@ -564,7 +566,8 @@ function renderComposerImages() {
|
||||
function formatMetrics(event) {
|
||||
const read = formatTokenMetric(event.reading_tokens, event.reading_tokens_per_second);
|
||||
const wrote = formatTokenMetric(event.writing_tokens, event.writing_tokens_per_second);
|
||||
return [read && `read ${read}`, wrote && `wrote ${wrote}`].filter(Boolean).join(" | ");
|
||||
const cache = formatCacheMetric(event.cache_hit_tokens, event.cache_miss_tokens);
|
||||
return [read && `read ${read}`, wrote && `wrote ${wrote}`, cache].filter(Boolean).join(" | ");
|
||||
}
|
||||
|
||||
function formatTokenMetric(tokens, speed) {
|
||||
@@ -573,6 +576,13 @@ function formatTokenMetric(tokens, speed) {
|
||||
return `${tokens} tok${speedText}`;
|
||||
}
|
||||
|
||||
function formatCacheMetric(hitTokens, missTokens) {
|
||||
if (!hitTokens && !missTokens) return "";
|
||||
const hit = Number(hitTokens || 0).toLocaleString();
|
||||
const miss = Number(missTokens || 0).toLocaleString();
|
||||
return `cache ${hit} hit / ${miss} miss`;
|
||||
}
|
||||
|
||||
function setWarning(text) {
|
||||
warningEl.hidden = !text;
|
||||
warningEl.textContent = text || "";
|
||||
@@ -597,15 +607,13 @@ const configFieldIds = {
|
||||
|
||||
const ollamaFieldIds = {
|
||||
model_provider: "model-provider",
|
||||
deepseek_base_url: "deepseek-base-url",
|
||||
deepseek_api_key: "deepseek-api-key",
|
||||
deepseek_model: "deepseek-model",
|
||||
ollama_base_url: "ollama-base-url",
|
||||
ollama_model: "ollama-model",
|
||||
ollama_num_ctx: "ollama-num-ctx",
|
||||
openai_base_url: "openai-base-url",
|
||||
openai_api_key: "openai-api-key",
|
||||
openai_model: "openai-model",
|
||||
model_reasoning_effort: "model-reasoning-effort",
|
||||
codex_command: "codex-command",
|
||||
codex_model: "codex-model",
|
||||
};
|
||||
|
||||
async function refreshConfig() {
|
||||
@@ -667,7 +675,7 @@ async function saveConfig(event) {
|
||||
const result = await response.json();
|
||||
renderConfig(result);
|
||||
configStatusEl.textContent = result.message || "Saved";
|
||||
addMessage("assistant", "Config saved. Restart TraderAI for the new settings to fully apply.");
|
||||
addMessage("assistant", result.message || "Config saved.");
|
||||
} catch (error) {
|
||||
configStatusEl.textContent = `Config save failed: ${fetchErrorMessage(error)}`;
|
||||
}
|
||||
@@ -715,18 +723,18 @@ function renderOllamaStatus(status) {
|
||||
updateProviderFieldVisibility(status.provider || "ollama");
|
||||
const provider = providerDisplayName(status.provider);
|
||||
const models = status.models?.length ? status.models.join(", ") : "None detected";
|
||||
const isOpenAIProvider = status.provider === "openai";
|
||||
const isCodexProvider = status.provider === "codex";
|
||||
const ready = isOpenAIProvider
|
||||
const isDeepSeekProvider = status.provider === "deepseek";
|
||||
const isCloudProvider = isDeepSeekProvider;
|
||||
const ready = isCloudProvider
|
||||
? Boolean(status.online && status.model_available)
|
||||
: Boolean(status.installed && status.running && status.model_available);
|
||||
const pillClass = ready ? "status-pill" : "status-pill warning";
|
||||
const detailItems = [
|
||||
ollamaStatusItem("Provider", provider),
|
||||
ollamaStatusItem("Model", status.configured_model || ""),
|
||||
ollamaStatusItem(isCodexProvider ? "Command" : "URL", status.base_url || ""),
|
||||
ollamaStatusItem("URL", status.base_url || ""),
|
||||
];
|
||||
if (!isOpenAIProvider && !isCodexProvider) {
|
||||
if (!isCloudProvider) {
|
||||
detailItems.splice(1, 0, ollamaStatusItem("Installed", status.installed ? "Yes" : "No"));
|
||||
detailItems.splice(2, 0, ollamaStatusItem("Running", status.running ? "Yes" : "No"));
|
||||
detailItems.push(ollamaStatusItem("Pulled", status.model_available ? "Yes" : "No"));
|
||||
@@ -740,30 +748,22 @@ function renderOllamaStatus(status) {
|
||||
<div class="ollama-status-grid">
|
||||
${detailItems.join("")}
|
||||
</div>
|
||||
${ollamaStatusItem(isOpenAIProvider || isCodexProvider ? "Available Models" : "Installed Models", models)}
|
||||
${ollamaStatusItem(isCloudProvider ? "Available Models" : "Installed Models", models)}
|
||||
${status.detail ? ollamaStatusItem("Detail", status.detail) : ""}
|
||||
`;
|
||||
if (ollamaDownloadButton) ollamaDownloadButton.hidden = isOpenAIProvider || isCodexProvider;
|
||||
if (ollamaDownloadButton) ollamaDownloadButton.hidden = isCloudProvider;
|
||||
if (ollamaInstallButton) {
|
||||
ollamaInstallButton.hidden = isOpenAIProvider || isCodexProvider || !status.can_auto_install;
|
||||
ollamaInstallButton.hidden = isCloudProvider || !status.can_auto_install;
|
||||
ollamaInstallButton.disabled = Boolean(status.installed) || !status.can_auto_install;
|
||||
}
|
||||
if (ollamaLaunchButton) {
|
||||
ollamaLaunchButton.hidden = isOpenAIProvider || isCodexProvider;
|
||||
ollamaLaunchButton.hidden = isCloudProvider;
|
||||
ollamaLaunchButton.disabled = !status.installed || Boolean(status.running);
|
||||
}
|
||||
if (ollamaPullButton) {
|
||||
ollamaPullButton.hidden = isOpenAIProvider || isCodexProvider;
|
||||
ollamaPullButton.hidden = isCloudProvider;
|
||||
ollamaPullButton.disabled = !status.running || Boolean(status.model_available);
|
||||
}
|
||||
if (codexLoginButton) {
|
||||
codexLoginButton.hidden = !isCodexProvider;
|
||||
codexLoginButton.disabled = Boolean(status.online);
|
||||
}
|
||||
if (openaiModelsRefreshButton) {
|
||||
openaiModelsRefreshButton.hidden = false;
|
||||
openaiModelsRefreshButton.disabled = false;
|
||||
}
|
||||
renderProviderModelOptions(status.models || [], status);
|
||||
renderReasoningEffortOptions(status.reasoning_efforts || [], status.configured_reasoning_effort || "medium");
|
||||
updateOllamaAttention(status);
|
||||
@@ -808,18 +808,16 @@ function setOllamaButtonAttention(button, action, active) {
|
||||
function updateOllamaAttention(status = null) {
|
||||
const currentStatus = status || latestOllamaStatus;
|
||||
if (!currentStatus) return;
|
||||
const isOpenAIProvider = currentStatus.provider === "openai";
|
||||
const isCodexProvider = currentStatus.provider === "codex";
|
||||
const ready = isOpenAIProvider
|
||||
const isDeepSeekProvider = currentStatus.provider === "deepseek";
|
||||
const isCloudProvider = isDeepSeekProvider;
|
||||
const ready = isCloudProvider
|
||||
? Boolean(currentStatus.online && currentStatus.model_available)
|
||||
: Boolean(currentStatus.installed && currentStatus.running && currentStatus.model_available);
|
||||
ollamaToggle?.classList.toggle("attention-pulse", !ready);
|
||||
setOllamaButtonAttention(ollamaDownloadButton, "download", !isOpenAIProvider && !isCodexProvider && !currentStatus.installed);
|
||||
setOllamaButtonAttention(ollamaInstallButton, "install", !isOpenAIProvider && !isCodexProvider && !currentStatus.installed && currentStatus.can_auto_install);
|
||||
setOllamaButtonAttention(ollamaLaunchButton, "launch", !isOpenAIProvider && !isCodexProvider && currentStatus.installed && !currentStatus.running);
|
||||
setOllamaButtonAttention(ollamaPullButton, "pull", !isOpenAIProvider && !isCodexProvider && currentStatus.running && !currentStatus.model_available);
|
||||
setOllamaButtonAttention(codexLoginButton, "codex-login", isCodexProvider && !currentStatus.online);
|
||||
setOllamaButtonAttention(openaiModelsRefreshButton, "openai-models", isOpenAIProvider && !currentStatus.model_available);
|
||||
setOllamaButtonAttention(ollamaDownloadButton, "download", !isCloudProvider && !currentStatus.installed);
|
||||
setOllamaButtonAttention(ollamaInstallButton, "install", !isCloudProvider && !currentStatus.installed && currentStatus.can_auto_install);
|
||||
setOllamaButtonAttention(ollamaLaunchButton, "launch", !isCloudProvider && currentStatus.installed && !currentStatus.running);
|
||||
setOllamaButtonAttention(ollamaPullButton, "pull", !isCloudProvider && currentStatus.running && !currentStatus.model_available);
|
||||
if (ready) clickedOllamaActions.clear();
|
||||
}
|
||||
|
||||
@@ -830,7 +828,11 @@ function configuredOllamaModel() {
|
||||
function updateProviderFieldVisibility(provider) {
|
||||
for (const field of providerScopedFields) {
|
||||
const scope = field.dataset.providerScope;
|
||||
field.hidden = scope !== provider;
|
||||
const hiddenManualModel = field.dataset.manualModel === "true" && provider !== "ollama";
|
||||
field.hidden = scope !== provider || hiddenManualModel;
|
||||
}
|
||||
if (providerModelLabel) {
|
||||
providerModelLabel.textContent = provider === "ollama" ? "Available Models" : "Model";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -867,54 +869,6 @@ function renderProviderModelOptions(models, status = latestOllamaStatus) {
|
||||
}
|
||||
}
|
||||
|
||||
async function refreshOpenAIModels() {
|
||||
setOllamaMessage("Loading provider models");
|
||||
try {
|
||||
const provider = document.getElementById("model-provider")?.value || latestOllamaStatus?.provider || "openai";
|
||||
const response = await fetch(`/api/provider/models?provider=${encodeURIComponent(provider)}`);
|
||||
const result = await response.json();
|
||||
if (!response.ok) throw new Error(result.detail || `HTTP ${response.status}`);
|
||||
renderProviderModelOptions(result.models || [], {
|
||||
provider: result.provider || provider,
|
||||
configured_model: configuredProviderModel(result.provider || provider),
|
||||
});
|
||||
setOllamaMessage(result.message || "Loaded provider models");
|
||||
await refreshOllamaStatus();
|
||||
} catch (error) {
|
||||
setOllamaMessage(`Provider model load failed: ${fetchErrorMessage(error)}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function launchCodexLogin() {
|
||||
markOllamaActionClicked("codex-login");
|
||||
setOllamaMessage("Starting Codex sign-in");
|
||||
try {
|
||||
const response = await fetch("/api/codex/login", { method: "POST" });
|
||||
const result = await response.json();
|
||||
if (!response.ok) throw new Error(result.detail || `HTTP ${response.status}`);
|
||||
if (result.auth_url) {
|
||||
window.open(result.auth_url, "_blank", "noopener,noreferrer");
|
||||
}
|
||||
setOllamaMessage(result.message || "Opened Codex sign-in in your browser. Waiting for completion...");
|
||||
await waitForCodexLogin();
|
||||
} catch (error) {
|
||||
setOllamaMessage(`Codex sign-in failed: ${fetchErrorMessage(error)}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function waitForCodexLogin() {
|
||||
for (let attempt = 0; attempt < 80; attempt += 1) {
|
||||
await new Promise((resolve) => setTimeout(resolve, attempt < 8 ? 1500 : 3000));
|
||||
await refreshOllamaStatus();
|
||||
const provider = latestOllamaStatus?.provider || "";
|
||||
if (provider === "codex" && latestOllamaStatus?.online) {
|
||||
setOllamaMessage("Codex sign-in complete.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
setOllamaMessage("Codex sign-in opened. If you completed it, click Load Provider Models or refresh provider status.");
|
||||
}
|
||||
|
||||
function renderReasoningEffortOptions(efforts, configured) {
|
||||
if (!modelReasoningEffortSelect) return;
|
||||
const options = [...new Set([...(efforts || []), configured || "medium"].filter(Boolean))];
|
||||
@@ -929,8 +883,7 @@ function renderReasoningEffortOptions(efforts, configured) {
|
||||
}
|
||||
|
||||
function configuredProviderModel(provider) {
|
||||
if (provider === "openai") return document.getElementById("openai-model")?.value || "";
|
||||
if (provider === "codex") return document.getElementById("codex-model")?.value || "";
|
||||
if (provider === "deepseek") return document.getElementById("deepseek-model")?.value || "";
|
||||
return document.getElementById("ollama-model")?.value || "";
|
||||
}
|
||||
|
||||
@@ -938,13 +891,8 @@ function syncSelectedProviderModel() {
|
||||
const provider = document.getElementById("model-provider")?.value || "ollama";
|
||||
const selectedModel = providerModelSelect?.value || "";
|
||||
if (!selectedModel) return;
|
||||
if (provider === "openai") {
|
||||
const field = document.getElementById("openai-model");
|
||||
if (field) field.value = selectedModel;
|
||||
return;
|
||||
}
|
||||
if (provider === "codex") {
|
||||
const field = document.getElementById("codex-model");
|
||||
if (provider === "deepseek") {
|
||||
const field = document.getElementById("deepseek-model");
|
||||
if (field) field.value = selectedModel;
|
||||
return;
|
||||
}
|
||||
@@ -953,8 +901,7 @@ function syncSelectedProviderModel() {
|
||||
}
|
||||
|
||||
function providerDisplayName(provider) {
|
||||
if (provider === "openai") return "OpenAI";
|
||||
if (provider === "codex") return "Codex";
|
||||
if (provider === "deepseek") return "DeepSeek";
|
||||
return "Local Ollama";
|
||||
}
|
||||
|
||||
@@ -1323,6 +1270,72 @@ function parsePlanItems(text) {
|
||||
});
|
||||
}
|
||||
|
||||
function formatPlanItems(items) {
|
||||
return (items || [])
|
||||
.map((item) => {
|
||||
const name = String(item.item_name || item.name || "").trim();
|
||||
if (!name) return "";
|
||||
const quantity = Number(item.desired_quantity || item.quantity || 1);
|
||||
const maxUnitPrice = item.max_unit_price ?? item.max_price;
|
||||
const parts = [name];
|
||||
if (Number.isFinite(quantity) && quantity > 1) parts.push(String(quantity));
|
||||
else if (maxUnitPrice !== null && maxUnitPrice !== undefined && maxUnitPrice !== "") parts.push("1");
|
||||
if (maxUnitPrice !== null && maxUnitPrice !== undefined && maxUnitPrice !== "") parts.push(String(maxUnitPrice));
|
||||
return parts.join(" | ");
|
||||
})
|
||||
.filter(Boolean)
|
||||
.join("\n");
|
||||
}
|
||||
|
||||
function applyPlanDraft(draft) {
|
||||
if (!draft) return;
|
||||
document.getElementById("plan-title").value = draft.title || "";
|
||||
document.getElementById("plan-objective").value = draft.objective || "";
|
||||
document.getElementById("plan-kind").value = draft.kind || "buying";
|
||||
document.getElementById("plan-tone").value = draft.constraints?.message_tone || "";
|
||||
document.getElementById("plan-instructions").value = draft.constraints?.instructions || "";
|
||||
document.getElementById("plan-cadence").value = draft.cadence || "";
|
||||
document.getElementById("plan-items").value = formatPlanItems(draft.items || []);
|
||||
}
|
||||
|
||||
async function autofillPlanDraft() {
|
||||
const title = document.getElementById("plan-title").value.trim();
|
||||
const objective = document.getElementById("plan-objective").value.trim();
|
||||
if (!title && !objective) {
|
||||
plansStatusEl.textContent = "Add at least a title or objective first";
|
||||
return;
|
||||
}
|
||||
const tone = document.getElementById("plan-tone").value.trim();
|
||||
const instructions = document.getElementById("plan-instructions").value.trim();
|
||||
const constraints = {};
|
||||
if (tone) constraints.message_tone = tone;
|
||||
if (instructions) constraints.instructions = instructions;
|
||||
const payload = {
|
||||
title,
|
||||
objective,
|
||||
kind: document.getElementById("plan-kind").value || "buying",
|
||||
constraints,
|
||||
items: parsePlanItems(document.getElementById("plan-items").value || ""),
|
||||
};
|
||||
plansStatusEl.textContent = "Drafting plan";
|
||||
if (planAutofillButton) planAutofillButton.disabled = true;
|
||||
try {
|
||||
const response = await fetch("/api/plans/draft", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
const result = await response.json();
|
||||
if (!response.ok) throw new Error(result.detail || `HTTP ${response.status}`);
|
||||
applyPlanDraft(result.draft || {});
|
||||
plansStatusEl.textContent = "Draft filled in. Review and edit anything you want.";
|
||||
} catch (error) {
|
||||
plansStatusEl.textContent = `Plan draft failed: ${fetchErrorMessage(error)}`;
|
||||
} finally {
|
||||
if (planAutofillButton) planAutofillButton.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlan(event) {
|
||||
event.preventDefault();
|
||||
const title = document.getElementById("plan-title").value.trim();
|
||||
@@ -1664,8 +1677,8 @@ async function checkHealth() {
|
||||
health = await fallbackResponse.json();
|
||||
}
|
||||
const provider = providerDisplayName(health.provider);
|
||||
const isOpenAIProvider = health.provider === "openai";
|
||||
const isCodexProvider = health.provider === "codex";
|
||||
const isDeepSeekProvider = health.provider === "deepseek";
|
||||
const isCloudProvider = isDeepSeekProvider;
|
||||
ollamaOnline = Boolean(health.online);
|
||||
if (!ollamaOnline) {
|
||||
statusEl.textContent = "Offline";
|
||||
@@ -1674,7 +1687,7 @@ async function checkHealth() {
|
||||
return false;
|
||||
}
|
||||
if (health.model_available === false) {
|
||||
const action = isOpenAIProvider ? "Load Provider Models." : isCodexProvider ? "Sign In to Codex." : "Install Model.";
|
||||
const action = isCloudProvider ? "Save a working DeepSeek model." : "Install Model.";
|
||||
setWarning(`${provider} needs the configured model "${health.model}". Open the model provider tab and use ${action}`);
|
||||
ollamaToggle?.classList.add("attention-pulse");
|
||||
} else {
|
||||
@@ -1890,6 +1903,7 @@ ollamaToggle?.addEventListener("click", () => toggleSidebarPanel("ollama"));
|
||||
plansRefreshButton?.addEventListener("click", () => refreshPlans());
|
||||
plansCloseButton?.addEventListener("click", closePlansPanel);
|
||||
planForm?.addEventListener("submit", createPlan);
|
||||
planAutofillButton?.addEventListener("click", autofillPlanDraft);
|
||||
ollamaForm?.addEventListener("submit", saveOllamaConfig);
|
||||
ollamaRefreshButton?.addEventListener("click", refreshOllamaStatus);
|
||||
ollamaDownloadButton?.addEventListener("click", () => {
|
||||
@@ -1908,17 +1922,12 @@ ollamaPullButton?.addEventListener("click", () => {
|
||||
markOllamaActionClicked("pull");
|
||||
postOllamaAction("/api/ollama/pull", { body: { model: configuredOllamaModel() } });
|
||||
});
|
||||
codexLoginButton?.addEventListener("click", launchCodexLogin);
|
||||
providerModelSelect?.addEventListener("change", syncSelectedProviderModel);
|
||||
document.getElementById("model-provider")?.addEventListener("change", () => {
|
||||
const provider = document.getElementById("model-provider")?.value || "ollama";
|
||||
updateProviderFieldVisibility(provider);
|
||||
renderProviderModelOptions(latestOllamaStatus?.models || [], { ...latestOllamaStatus, provider });
|
||||
});
|
||||
openaiModelsRefreshButton?.addEventListener("click", () => {
|
||||
markOllamaActionClicked("openai-models");
|
||||
refreshOpenAIModels();
|
||||
});
|
||||
updateCheckButton?.addEventListener("click", checkForUpdate);
|
||||
updateInstallButton?.addEventListener("click", installUpdate);
|
||||
updateOpenReleasesButton?.addEventListener("click", openReleasesPage);
|
||||
@@ -1979,6 +1988,8 @@ async function sendMessage() {
|
||||
const event = JSON.parse(line.slice(6));
|
||||
if (event.type === "status") {
|
||||
setMessageActivity(assistantNode, event.message, true);
|
||||
} else if (event.type === "reasoning") {
|
||||
appendThinkingText(assistantNode, event.content || "");
|
||||
} else if (event.type === "metrics") {
|
||||
setMessageMetrics(assistantNode, formatMetrics(event));
|
||||
} else if (event.type === "warning") {
|
||||
|
||||
+9
-11
@@ -125,20 +125,17 @@
|
||||
<form class="config-form" id="ollama-config-form">
|
||||
<label>Provider
|
||||
<select id="model-provider" name="model_provider">
|
||||
<option value="deepseek">DeepSeek V4 (Recommended)</option>
|
||||
<option value="ollama">Local Ollama</option>
|
||||
<option value="openai">OpenAI</option>
|
||||
<option value="codex">Codex</option>
|
||||
</select>
|
||||
</label>
|
||||
<label data-provider-scope="deepseek">DeepSeek URL<input id="deepseek-base-url" name="deepseek_base_url" type="text"></label>
|
||||
<label data-provider-scope="deepseek">DeepSeek API Key<input id="deepseek-api-key" name="deepseek_api_key" type="password" autocomplete="off"></label>
|
||||
<label data-provider-scope="deepseek" data-manual-model="true">DeepSeek Model<input id="deepseek-model" name="deepseek_model" type="text" list="provider-models"></label>
|
||||
<label data-provider-scope="ollama">Ollama URL<input id="ollama-base-url" name="ollama_base_url" type="text"></label>
|
||||
<label data-provider-scope="ollama">Ollama Model<input id="ollama-model" name="ollama_model" type="text" list="provider-models"></label>
|
||||
<label data-provider-scope="ollama">Context Tokens<input id="ollama-num-ctx" name="ollama_num_ctx" type="number" min="1024" step="1024"></label>
|
||||
<label data-provider-scope="openai">OpenAI URL<input id="openai-base-url" name="openai_base_url" type="text"></label>
|
||||
<label data-provider-scope="openai">OpenAI API Key<input id="openai-api-key" name="openai_api_key" type="password" autocomplete="off"></label>
|
||||
<label data-provider-scope="openai">OpenAI Model<input id="openai-model" name="openai_model" type="text" list="provider-models"></label>
|
||||
<label data-provider-scope="codex">Codex Command<input id="codex-command" name="codex_command" type="text"></label>
|
||||
<label data-provider-scope="codex">Codex Model<input id="codex-model" name="codex_model" type="text" list="provider-models"></label>
|
||||
<label>Available Models<select id="provider-model-select"></select></label>
|
||||
<label><span id="provider-model-label">Model</span><select id="provider-model-select"></select></label>
|
||||
<label>Reasoning Effort<select id="model-reasoning-effort" name="model_reasoning_effort"></select></label>
|
||||
<datalist id="provider-models"></datalist>
|
||||
<button type="submit">Save Provider Config</button>
|
||||
@@ -149,8 +146,6 @@
|
||||
<button class="secondary small-button" id="ollama-install" type="button">Auto Install</button>
|
||||
<button class="secondary small-button" id="ollama-launch" type="button">Launch</button>
|
||||
<button class="small-button" id="ollama-pull" type="button">Install Model</button>
|
||||
<button class="secondary small-button" id="codex-login" type="button">Sign In to Codex</button>
|
||||
<button class="secondary small-button" id="openai-models-refresh" type="button">Load Provider Models</button>
|
||||
</div>
|
||||
<div class="config-status" id="ollama-message"></div>
|
||||
</div>
|
||||
@@ -233,7 +228,10 @@
|
||||
<span>Buying plans work best with item lines. Custom plans can run with just instructions.</span>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit">Create Plan</button>
|
||||
<div class="plan-form-actions">
|
||||
<button id="plan-autofill" type="button">AI Fill</button>
|
||||
<button type="submit">Create Plan</button>
|
||||
</div>
|
||||
<div class="config-status" id="plans-status"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -1302,6 +1302,15 @@ button.secondary {
|
||||
min-height: 96px;
|
||||
}
|
||||
|
||||
.plan-form-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.plan-form-actions button {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.plan-form-split {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
|
||||
@@ -0,0 +1,175 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<link href="https://qtrypzzcjebvfcihiynt.supabase.co/storage/v1/object/public/base44-prod/public/695be2905c0b4866dfb21265/62b39a568_Wikapp3.webp" rel="icon" type="image/svg+xml"/>
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
|
||||
<link href="/manifest.json" rel="manifest"/>
|
||||
<title>
|
||||
Ships | Wikelo Project Tracker
|
||||
</title>
|
||||
<script crossorigin="" src="/assets/index-DWqdqkK8.js" type="module">
|
||||
</script>
|
||||
<link crossorigin="" href="/assets/index-BzxCYXI2.css" rel="stylesheet"/>
|
||||
<meta content="Ships on Wikelo Project Tracker. Track materials needed and contributed for building your Star Citizen ships." name="description"/>
|
||||
<meta content="Ships | Wikelo Project Tracker" property="og:title"/>
|
||||
<meta content="Ships on Wikelo Project Tracker. Track materials needed and contributed for building your Star Citizen ships." property="og:description"/>
|
||||
<meta content="https://qtrypzzcjebvfcihiynt.supabase.co/storage/v1/render/image/public/base44-prod/public/695be2905c0b4866dfb21265/62b39a568_Wikapp3.webp?width=1200&height=630&resize=contain" property="og:image"/>
|
||||
<meta content="https://wikelo-projects.com/Ships" property="og:url"/>
|
||||
<meta content="website" property="og:type"/>
|
||||
<meta content="Wikelo Project Tracker" property="og:site_name"/>
|
||||
<meta content="Ships | Wikelo Project Tracker" name="twitter:title"/>
|
||||
<meta content="Ships on Wikelo Project Tracker. Track materials needed and contributed for building your Star Citizen ships." name="twitter:description"/>
|
||||
<meta content="https://qtrypzzcjebvfcihiynt.supabase.co/storage/v1/render/image/public/base44-prod/public/695be2905c0b4866dfb21265/62b39a568_Wikapp3.webp?width=1200&height=630&resize=contain" name="twitter:image"/>
|
||||
<meta content="summary_large_image" name="twitter:card"/>
|
||||
<meta content="https://wikelo-projects.com/Ships" name="twitter:url"/>
|
||||
<meta content="yes" name="mobile-web-app-capable"/>
|
||||
<meta content="black" name="apple-mobile-web-app-status-bar-style"/>
|
||||
<meta content="Wikelo Project Tracker" name="apple-mobile-web-app-title"/>
|
||||
<link href="https://wikelo-projects.com/Ships" rel="canonical"/>
|
||||
<script data-seo-source="builder" type="application/ld+json">
|
||||
{"name": "Wikelo Project Tracker", "@context": "https://schema.org", "@type": "WebSite", "url": "https://wikelo-projects.com"}
|
||||
</script>
|
||||
<script data-seo-source="builder" type="application/ld+json">
|
||||
{"name": "Wikelo Project Tracker", "logo": "https://qtrypzzcjebvfcihiynt.supabase.co/storage/v1/object/public/base44-prod/public/695be2905c0b4866dfb21265/62b39a568_Wikapp3.webp", "@context": "https://schema.org", "@type": "Organization", "url": "https://wikelo-projects.com"}
|
||||
</script>
|
||||
<script data-seo-source="builder" type="application/ld+json">
|
||||
{"@context": "https://schema.org", "@type": "BreadcrumbList", "itemListElement": [{"@type": "ListItem", "position": 1, "name": "Home", "item": "https://wikelo-projects.com/"}, {"@type": "ListItem", "position": 2, "name": "Ships | Wikelo Project Tracker", "item": "https://wikelo-projects.com/Ships"}]}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root">
|
||||
<div data-seo-source="builder" id="seo-snapshot" style="position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0;">
|
||||
<h1>
|
||||
Ships | Wikelo Project Tracker
|
||||
</h1>
|
||||
<p>
|
||||
Ships on Wikelo Project Tracker. Track materials needed and contributed for building your Star Citizen ships.
|
||||
</p>
|
||||
<nav aria-label="Pages">
|
||||
<h2>
|
||||
Pages
|
||||
</h2>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="/AdminAds">
|
||||
Admin Ads
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/AdvertiseWithUs">
|
||||
Advertise With Us
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/ArmorProjectDetails">
|
||||
Armor Project Details
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Armors">
|
||||
Armors
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/CleanupMaterials">
|
||||
Cleanup Materials
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Guide">
|
||||
Guide
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/">
|
||||
Home
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Inventory">
|
||||
Inventory
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Messages">
|
||||
Messages
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/NotificationSettings">
|
||||
Notification Settings
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Notifications">
|
||||
Notifications
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/OrganizationDetails">
|
||||
Organization Details
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Organizations">
|
||||
Organizations
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Profile">
|
||||
Profile
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/ProjectDetails">
|
||||
Project Details
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/RecalculateContributionReputation">
|
||||
Recalculate Contribution Reputation
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/RecalculateMaterials">
|
||||
Recalculate Materials
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/RecalculateReputation">
|
||||
Recalculate Reputation
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Reputation">
|
||||
Reputation
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/UpdateInfo">
|
||||
Update Info
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/WeaponProjectDetails">
|
||||
Weapon Project Details
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/Weapons">
|
||||
Weapons
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/WikeloProjectDetails">
|
||||
Wikelo Project Details
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user