DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
Preserve current provider configuration and settings scroll work
Bingxi Zhao (Frank)fb2065b6a951
diff --git a/deeptutor/services/config/embedding_endpoint.py b/deeptutor/services/config/embedding_endpoint.pyindex 10dab12f4..50f92234b 100644--- a/deeptutor/services/config/embedding_endpoint.py+++ b/deeptutor/services/config/embedding_endpoint.py@@ -101,7 +101,6 @@ EMBEDDING_PROVIDER_LABELS = {"openai": "OpenAI","gemini": "Gemini","openrouter": "OpenRouter",- "orcarouter": "OrcaRouter","jina": "Jina","vllm": "vLLM / LM Studio","lemonade": "Lemonade Server",@@ -114,7 +113,6 @@ EMBEDDING_PROVIDER_DEFAULT_ENDPOINTS = {"openai": "https://api.openai.com/v1/embeddings","gemini": gemini_embedding_endpoint(GEMINI_DEFAULT_EMBEDDING_MODEL),"openrouter": "https://openrouter.ai/api/v1/embeddings",- "orcarouter": "https://api.orcarouter.ai/v1/embeddings","cohere": "https://api.cohere.com/v2/embed","jina": "https://api.jina.ai/v1/embeddings","ollama": "http://localhost:11434/api/embed",@@ -130,7 +128,6 @@ EMBEDDING_PROVIDER_DEFAULT_ENDPOINTS = {EMBEDDING_PROVIDERS_REQUIRING_EMBEDDINGS_PATH = {"openai","openrouter",- "orcarouter","jina","vllm","lemonade",diff --git a/deeptutor/services/config/provider_runtime.py b/deeptutor/services/config/provider_runtime.pyindex 547acec4e..a51021475 100644--- a/deeptutor/services/config/provider_runtime.py+++ b/deeptutor/services/config/provider_runtime.py@@ -283,15 +283,6 @@ EMBEDDING_PROVIDERS: dict[str, EmbeddingProviderSpec] = {keywords=("openrouter",),is_local=False,),- "orcarouter": EmbeddingProviderSpec(- label="OrcaRouter",- adapter="openai_compat",- default_api_base=EMBEDDING_PROVIDER_DEFAULT_ENDPOINTS["orcarouter"],- keywords=("orcarouter", "orca_router"),- is_local=False,- default_model="openai/text-embedding-3-large",- default_dim=3072,- ),}diff --git a/deeptutor/services/llm/capabilities.py b/deeptutor/services/llm/capabilities.pyindex e04cc32ca..927eea0f5 100644--- a/deeptutor/services/llm/capabilities.py+++ b/deeptutor/services/llm/capabilities.py@@ -154,14 +154,6 @@ PROVIDER_CAPABILITIES: dict[str, dict[str, object]] = {"supports_vision": True, # Depends on underlying model"system_in_messages": True,},- # OrcaRouter (aggregator, generally OpenAI-compatible)- "orcarouter": {- "supports_response_format": True, # Depends on underlying model- "supports_streaming": True,- "supports_tools": True,- "supports_vision": True, # Depends on underlying model- "system_in_messages": True,- },# Groq (fast inference)"groq": {"supports_response_format": True,diff --git a/deeptutor/services/provider_registry.py b/deeptutor/services/provider_registry.pyindex 05a7bcaa0..7d0a483d3 100644--- a/deeptutor/services/provider_registry.py+++ b/deeptutor/services/provider_registry.py@@ -153,8 +153,6 @@ PROVIDER_ALIASES = {"atlas-cloud": "atlascloud","eden_ai": "edenai","novita_ai": "novita",- "orca_router": "orcarouter",- "orca-router": "orcarouter","cheaper_inference": "cheaperinference","api route": "api_route","future_infra": "futureinfra",@@ -229,17 +227,6 @@ PROVIDERS: tuple[ProviderSpec, ...] = (default_api_base="https://openrouter.ai/api/v1",supports_prompt_caching=True,),- ProviderSpec(- name="orcarouter",- keywords=("orcarouter", "orca_router", "orca router"),- env_key="ORCAROUTER_API_KEY",- display_name="OrcaRouter",- backend="openai_compat",- is_gateway=True,- detect_by_key_prefix="sk-orca-",- detect_by_base_keyword="orcarouter",- default_api_base="https://api.orcarouter.ai/v1",- ),ProviderSpec(name="edenai",keywords=("edenai",),diff --git a/deeptutor/services/rag/pipelines/graphrag/config.py b/deeptutor/services/rag/pipelines/graphrag/config.pyindex baaca45ce..41a25d4b9 100644--- a/deeptutor/services/rag/pipelines/graphrag/config.py+++ b/deeptutor/services/rag/pipelines/graphrag/config.py@@ -67,7 +67,6 @@ OPENAI_COMPATIBLE_EMBEDDING_BINDINGS = frozenset("jina","openai","openrouter",- "orcarouter","siliconflow","vllm",}diff --git a/deeptutor_cli/init_wizard.py b/deeptutor_cli/init_wizard.pyindex 740062f69..77fd6e8d3 100644--- a/deeptutor_cli/init_wizard.py+++ b/deeptutor_cli/init_wizard.py@@ -74,12 +74,6 @@ LLM_FALLBACK_MODELS: dict[str, tuple[str, ...]] = {"anthropic/claude-sonnet-4-6","deepseek/deepseek-chat",),- "orcarouter": (- "orcarouter/auto",- "anthropic/claude-sonnet-4-6",- "deepseek/deepseek-v4-pro",- "openai/gpt-4o",- ),"ollama": ("llama3.2", "qwen2.5", "mistral"),}@@ -115,7 +109,6 @@ EMBEDDING_FALLBACK_MODELS: dict[str, tuple[str, ...]] = {"jina": ("jina-embeddings-v3", "jina-embeddings-v2-base-en"),"cohere": ("embed-v4.0", "embed-multilingual-v3.0", "embed-english-v3.0"),"openrouter": ("openai/text-embedding-3-large",),- "orcarouter": ("openai/text-embedding-3-large",),"vllm": ("BAAI/bge-m3",),"ollama": ("nomic-embed-text", "mxbai-embed-large", "snowflake-arctic-embed"),}diff --git a/tests/services/config/test_embedding_runtime.py b/tests/services/config/test_embedding_runtime.pyindex f034beead..2dbbc54bf 100644--- a/tests/services/config/test_embedding_runtime.py+++ b/tests/services/config/test_embedding_runtime.py@@ -206,13 +206,13 @@ def test_remote_openai_compatible_endpoint_still_requires_key() -> None:get_embedding_config(catalog=catalog)-def test_embedding_orcarouter_binding_uses_default_endpoint() -> None:+def test_embedding_orcarouter_uses_explicit_custom_endpoint() -> None:catalog = _build_catalog(embedding_profile={"id": "embedding-p","name": "Embedding",- "binding": "orcarouter",- "base_url": "",+ "binding": "custom",+ "base_url": "https://api.orcarouter.ai/v1/embeddings","api_key": "sk-orca-test-key","api_version": "","extra_headers": {},@@ -227,8 +227,8 @@ def test_embedding_orcarouter_binding_uses_default_endpoint() -> None:})resolved = resolve_embedding_runtime_config(catalog=catalog)- assert resolved.provider_name == "orcarouter"- assert resolved.provider_mode == "standard"+ assert resolved.provider_name == "custom"+ assert resolved.provider_mode == "direct"assert resolved.effective_url == "https://api.orcarouter.ai/v1/embeddings"assert resolved.dimension == 3072diff --git a/tests/services/config/test_provider_runtime.py b/tests/services/config/test_provider_runtime.pyindex 3cba592f9..63d4fd387 100644--- a/tests/services/config/test_provider_runtime.py+++ b/tests/services/config/test_provider_runtime.py@@ -136,13 +136,13 @@ def test_llm_api_base_keyword_gateway() -> None:assert resolved.extra_headers == {"APP-Code": "x"}-def test_llm_orcarouter_binding_uses_default_endpoint() -> None:+def test_llm_orcarouter_uses_explicit_custom_endpoint() -> None:catalog = _build_catalog(llm_profile={"id": "llm-p","name": "OrcaRouter",- "binding": "orcarouter",- "base_url": "",+ "binding": "custom",+ "base_url": "https://api.orcarouter.ai/v1","api_key": "sk-orca-test-key","api_version": "","extra_headers": {},@@ -150,46 +150,8 @@ def test_llm_orcarouter_binding_uses_default_endpoint() -> None:})resolved = resolve_llm_runtime_config(catalog=catalog)- assert resolved.provider_name == "orcarouter"- assert resolved.provider_mode == "gateway"- assert resolved.effective_url == "https://api.orcarouter.ai/v1"---def test_llm_orcarouter_key_prefix_gateway() -> None:- catalog = _build_catalog(- llm_profile={- "id": "llm-p",- "name": "LLM",- "binding": "",- "base_url": "",- "api_key": "sk-orca-test-key",- "api_version": "",- "extra_headers": {},- "models": [{"id": "llm-m", "name": "m", "model": "anthropic/claude-sonnet-4.6"}],- }- )- resolved = resolve_llm_runtime_config(catalog=catalog)- assert resolved.provider_name == "orcarouter"- assert resolved.provider_mode == "gateway"- assert resolved.effective_url == "https://api.orcarouter.ai/v1"---def test_llm_orcarouter_base_keyword_gateway() -> None:- catalog = _build_catalog(- llm_profile={- "id": "llm-p",- "name": "LLM",- "binding": "",- "base_url": "https://api.orcarouter.ai/v1",- "api_key": "k",- "api_version": "",- "extra_headers": {},- "models": [{"id": "llm-m", "name": "m", "model": "deepseek/deepseek-v4-pro"}],- }- )- resolved = resolve_llm_runtime_config(catalog=catalog)- assert resolved.provider_name == "orcarouter"- assert resolved.provider_mode == "gateway"+ assert resolved.provider_name == "custom"+ assert resolved.provider_mode == "direct"assert resolved.effective_url == "https://api.orcarouter.ai/v1"diff --git a/tests/services/rag/test_graphrag_pipeline.py b/tests/services/rag/test_graphrag_pipeline.pyindex 7510ed5e2..1b0dc41d8 100644--- a/tests/services/rag/test_graphrag_pipeline.py+++ b/tests/services/rag/test_graphrag_pipeline.py@@ -225,7 +225,7 @@ def test_build_settings_preserves_embedding_request_options("https://generativelanguage.googleapis.com/v1beta/openai",),("openrouter", "https://openrouter.ai/api/v1/embeddings", "https://openrouter.ai/api/v1"),- ("orcarouter", "https://api.orcarouter.ai/v1/embeddings", "https://api.orcarouter.ai/v1"),+ ("custom", "https://api.orcarouter.ai/v1/embeddings", "https://api.orcarouter.ai/v1"),("vllm", "http://localhost:8000/v1/embeddings", "http://localhost:8000/v1"),("jina", "https://api.jina.ai/v1/embeddings", "https://api.jina.ai/v1"),("custom", "https://gateway.test/v1/embeddings", "https://gateway.test/v1"),diff --git a/tests/services/test_provider_registry.py b/tests/services/test_provider_registry.pyindex bd7b95de2..80ebdb392 100644--- a/tests/services/test_provider_registry.py+++ b/tests/services/test_provider_registry.py@@ -141,20 +141,10 @@ def test_github_copilot_is_oauth_backed() -> None:assert spec.env_key == ""-def test_orcarouter_provider_aliases_and_detection() -> None:- spec = find_by_name("orcarouter")-- assert spec is not None- assert spec.display_name == "OrcaRouter"- assert spec.env_key == "ORCAROUTER_API_KEY"- assert spec.backend == "openai_compat"- assert spec.mode == "gateway"- assert spec.default_api_base == "https://api.orcarouter.ai/v1"- assert find_by_name("orca_router") == spec- assert find_by_name("orca-router") == spec- # sk-orca- keys must resolve to OrcaRouter, not OpenRouter (sk-or-).- assert find_gateway(api_key="sk-orca-test-key") == spec- assert find_gateway(api_base="https://api.orcarouter.ai/v1") == spec- # An OpenRouter key/base must not be claimed by OrcaRouter.- assert find_gateway(api_key="sk-or-v1-abcdef") is not None- assert find_gateway(api_key="sk-or-v1-abcdef").name != "orcarouter"+def test_orcarouter_is_not_a_builtin_provider() -> None:+ assert find_by_name("orcarouter") is None+ assert find_by_name("orca_router") is None+ assert find_by_name("orca-router") is None+ assert find_gateway(api_key="sk-orca-test-key") is None+ assert find_gateway(api_base="https://api.orcarouter.ai/v1") is None+ assert find_gateway(api_key="sk-or-v1-abcdef") == find_by_name("openrouter")diff --git a/web/components/settings/ModelsWorkspace.tsx b/web/components/settings/ModelsWorkspace.tsxindex 86962f5d0..a6f4cef5c 100644--- a/web/components/settings/ModelsWorkspace.tsx+++ b/web/components/settings/ModelsWorkspace.tsx@@ -1,5 +1,6 @@"use client";+import { scrollToSettingsElement } from "@/features/settings/navigation/settings-scroll";import Tooltip from "@/shared/ui/Tooltip";import { stageRegistryAction, type RegistryEdit } from "@/lib/provider-registry";import { useEffect, useId, useRef, useState } from "react";@@ -99,10 +100,7 @@ export function ModelsWorkspace({const revealDetail = () => {if (window.matchMedia("(max-width: 1279px)").matches)requestAnimationFrame(() =>- editorRef.current?.scrollIntoView({- behavior: "smooth",- block: "start",- }),+ scrollToSettingsElement(editorRef.current),);};const selectModel = (key: string) => {diff --git a/web/components/settings/ProvidersWorkspace.tsx b/web/components/settings/ProvidersWorkspace.tsxindex d0e6f01e3..c41153157 100644--- a/web/components/settings/ProvidersWorkspace.tsx+++ b/web/components/settings/ProvidersWorkspace.tsx@@ -1,5 +1,6 @@"use client";+import { scrollToSettingsElement } from "@/features/settings/navigation/settings-scroll";import Tooltip from "@/shared/ui/Tooltip";import { stageRegistryAction, type RegistryEdit } from "@/lib/provider-registry";import { useEffect, useRef, useState } from "react";@@ -66,10 +67,7 @@ export function ProvidersWorkspace() {const revealDetail = () => {if (window.matchMedia("(max-width: 1279px)").matches)requestAnimationFrame(() =>- editorRef.current?.scrollIntoView({- behavior: "smooth",- block: "start",- }),+ scrollToSettingsElement(editorRef.current),);};useEffect(() => {diff --git a/web/components/settings/SettingsMain.tsx b/web/components/settings/SettingsMain.tsxindex a2db14e70..2104c0186 100644--- a/web/components/settings/SettingsMain.tsx+++ b/web/components/settings/SettingsMain.tsx@@ -57,7 +57,7 @@ export default function SettingsMain({ children }: { children: React.ReactNode })return (- <div className="flex h-dvh overflow-hidden bg-[var(--background)]" data-settings-shell>+ <div className="fixed inset-0 flex h-dvh overflow-hidden bg-[var(--background)]" data-settings-shell><aside className="hidden w-[248px] shrink-0 flex-col border-r border-border/60 bg-[var(--background)] md:flex"><div className="px-2.5 pb-1.5 pt-4">{returnButton}</div><SettingsNav />diff --git a/web/features/settings/navigation/settings-scroll.ts b/web/features/settings/navigation/settings-scroll.tsindex b7e550c2c..c6eaa2939 100644--- a/web/features/settings/navigation/settings-scroll.ts+++ b/web/features/settings/navigation/settings-scroll.ts@@ -23,6 +23,14 @@ export function scrollToSettingsSection(behavior: ScrollBehavior = "smooth",): boolean {const target = document.getElementById(key);+ return scrollToSettingsElement(target, behavior);+}++/** Reveal a detail pane without scrolling the full-height app or the browser viewport. */+export function scrollToSettingsElement(+ target: HTMLElement | null,+ behavior: ScrollBehavior = "smooth",+): boolean {const scroller = target?.closest<HTMLElement>(SETTINGS_SCROLL_SELECTOR);if (!target || !scroller) return false;@@ -35,6 +43,7 @@ export function scrollToSettingsSection(scroller.scrollTop +targetRect.top -scrollerRect.top -+ scroller.clientTop -(Number.isFinite(scrollMargin) ? scrollMargin : 0);scroller.scrollTo({ top: Math.max(0, top), behavior });diff --git a/web/tests/settings-scroll.spec.ts b/web/tests/settings-scroll.spec.tsnew file mode 100644index 000000000..5f866eeb8--- /dev/null+++ b/web/tests/settings-scroll.spec.ts@@ -0,0 +1,64 @@+import { afterEach, describe, expect, it, vi } from "vitest";+import { scrollToSettingsElement, scrollToSettingsSection } from "@/features/settings/navigation/settings-scroll";++afterEach(() => { document.body.replaceChildren(); vi.unstubAllGlobals(); });++function fixture() {+ const outer = document.createElement("div");+ outer.style.overflow = "hidden";+ const scroller = document.createElement("div");+ scroller.dataset.settingsScroll = "";+ const target = document.createElement("div");+ target.id = "provider-detail";+ target.style.scrollMarginTop = "16px";+ outer.append(scroller);+ scroller.append(target);+ document.body.append(outer);+ scroller.scrollTop = 200;+ Object.defineProperty(scroller, "clientTop", { value: 1 });+ vi.spyOn(scroller, "getBoundingClientRect").mockReturnValue({ top: 40 } as DOMRect);+ vi.spyOn(target, "getBoundingClientRect").mockReturnValue({ top: 340 } as DOMRect);+ const scrollTo = vi.fn();+ scroller.scrollTo = scrollTo;+ const scrollIntoView = vi.fn();+ target.scrollIntoView = scrollIntoView;+ const rootScroll = vi.spyOn(window, "scrollTo").mockImplementation(() => {});+ const frames: FrameRequestCallback[] = [];+ vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => { frames.push(callback); return frames.length; });+ return { target, scrollTo, scrollIntoView, rootScroll, frames };+}++describe("settings detail scrolling", () => {+ it("scrolls only the settings document, accounting for existing scroll, border and margin", () => {+ const { target, scrollTo, scrollIntoView, rootScroll } = fixture();+ expect(scrollToSettingsElement(target)).toBe(true);+ expect(scrollTo).toHaveBeenCalledWith({ top: 483, behavior: "smooth" });+ expect(scrollIntoView).not.toHaveBeenCalled();+ expect(rootScroll).toHaveBeenCalledWith({ top: 0, left: 0, behavior: "auto" });+ });+ it("repairs displaced document roots immediately and after browser default scrolling", () => {+ const { target, frames } = fixture();+ document.documentElement.scrollTop = 800;+ document.body.scrollTop = 800;+ scrollToSettingsElement(target);+ expect(document.documentElement.scrollTop).toBe(0);+ expect(document.body.scrollTop).toBe(0);+ document.documentElement.scrollTop = 900;+ frames[0](0);+ expect(document.documentElement.scrollTop).toBe(0);+ });+ it("retains section navigation and clamps targets above the viewport", () => {+ const { target, scrollTo } = fixture();+ vi.mocked(target.getBoundingClientRect).mockReturnValue({ top: -800 } as DOMRect);+ expect(scrollToSettingsSection(target.id, "instant")).toBe(true);+ expect(scrollTo).toHaveBeenCalledWith({ top: 0, behavior: "instant" });+ });+ it("does not scroll unrelated pages or a detail pane that has unmounted", () => {+ const { rootScroll, scrollTo } = fixture();+ expect(scrollToSettingsElement(document.createElement("div"))).toBe(false);+ expect(scrollToSettingsElement(null)).toBe(false);+ expect(scrollToSettingsSection("missing")).toBe(false);+ expect(rootScroll).not.toHaveBeenCalled();+ expect(scrollTo).not.toHaveBeenCalled();+ });+});