aria-code 0.153.0__tar.gz → 0.155.0__tar.gz

{aria_code-0.153.0/src/aria_code.egg-info → aria_code-0.155.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.153.0
+Version: 0.155.0
 Summary: Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves
 License: Apache-2.0
 Project-URL: Homepage, https://github.com/artheras/aria-code
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.153.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.153.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.155.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.155.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.153.0 → aria_code-0.155.0}/README.md

@@ -15,7 +15,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.153.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.153.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.155.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.155.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.153.0 → aria_code-0.155.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aria-code"
-version = "0.153.0"
+version = "0.155.0"
 description = "Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves"
 readme = "README.md"
 license = { text = "Apache-2.0" }

{aria_code-0.153.0 → aria_code-0.155.0}/src/aria_code/_version.py

@@ -17,4 +17,4 @@ from __future__ import annotations
 
 __all__ = ["__version__"]
 
-__version__ = "0.153.0"
+__version__ = "0.155.0"

aria_code-0.155.0/src/aria_code/providers/llm/arthera_gateway.py

@@ -0,0 +1,74 @@
+"""Google models through the Arthera gateway, using the session you signed in with.
+
+`/login` gave you an identity and nothing else: to reach a Google model you
+still needed a Gemini API key from AI Studio, or gcloud and a billed Google
+Cloud project of your own. That is setup this product exists to spare people,
+and every layer of it is a place to get stuck — a missing dependency, gcloud
+not on PATH, a suspended billing account.
+
+The server holds a project and a service account with access to Vertex, and
+exposes it in the OpenAI shape. So this provider is the ordinary
+OpenAI-compatible one pointed at that endpoint, authorised with the Firebase
+token `/login` already stored. There is nothing for the user to configure.
+
+The token is read at call time rather than captured once, because it lasts an
+hour and `/login` refreshes it in the same config file.
+"""
+from __future__ import annotations
+
+import json
+import logging
+import os
+from pathlib import Path
+from typing import Optional
+
+from .base import ProviderConfig
+from .openai_compat import OpenAICompatProvider
+
+logger = logging.getLogger(__name__)
+
+DEFAULT_API_URL = "https://api.arthera.finance"
+DEFAULT_MODEL = "google/gemini-3.5-flash"
+
+
+def _config_path() -> Path:
+    return Path(os.getenv("ARIA_CONFIG_DIR", Path.home() / ".arthera")) / "config.json"
+
+
+def session_token() -> Optional[str]:
+    """The Firebase token `/login` stored, or None when signed out."""
+    try:
+        config = json.loads(_config_path().read_text(encoding="utf-8"))
+    except (OSError, ValueError):
+        return None
+    token = config.get("auth_token")
+    return str(token) if token else None
+
+
+def gateway_base_url() -> str:
+    """Where the gateway lives. Overridable for staging and self-hosting."""
+    api = os.getenv("ARIA_API_URL", "").strip() or DEFAULT_API_URL
+    return f"{api.rstrip('/')}/api/v2/llm/v1"
+
+
+class ArtheraGatewayProvider(OpenAICompatProvider):
+    """Google models billed to the Arthera project, for a signed-in user."""
+
+    provider_name = "arthera"
+    DEFAULT_BASE_URL = ""          # resolved per instance; it is deployment state
+    DEFAULT_MODEL = DEFAULT_MODEL
+
+    def __init__(self, config: ProviderConfig):
+        if not config.base_url:
+            config.base_url = gateway_base_url()
+        # The bearer is the session, not a key the user pasted. Reading it
+        # here keeps a signed-out user from presenting an empty credential
+        # and getting a 401 they cannot act on.
+        if not config.api_key:
+            config.api_key = session_token() or ""
+        super().__init__(config)
+
+    @staticmethod
+    def available() -> bool:
+        """True when there is a session to authorise calls with."""
+        return bool(session_token())

{aria_code-0.153.0 → aria_code-0.155.0}/src/aria_code/providers/llm/registry.py

@@ -30,6 +30,7 @@ from .base import BaseLLMProvider, Message, ProviderConfig
 from .ollama import OllamaProvider
 from .openai_compat import (
     DeepSeekProvider, OpenAIProvider, GroqProvider, GoogleProvider,
+
     TogetherProvider, DashScopeProvider, LMStudioProvider,
     SiliconFlowProvider, MoonshotProvider, ZhiPuProvider,
 )
@@ -42,6 +43,8 @@ from aria_code.packages.aria_services.provider_health import (
 )
 from aria_code.packages.aria_core.paths import aria_home
 
+from .arthera_gateway import ArtheraGatewayProvider
+
 logger = logging.getLogger(__name__)
 
 # ── Provider 目录：name → class ──────────────────────────────────────────────
@@ -54,6 +57,9 @@ _PROVIDER_CLASSES: Dict[str, Type[BaseLLMProvider]] = {
     # entry, so it could not be reached through the provider chain at all.
     "google":       GoogleProvider,
     "gemini":       GoogleProvider,
+    # Google models through the Arthera gateway, authorised by the session
+    # /login stored. Needs no key from the user, which is the point.
+    "arthera":      ArtheraGatewayProvider,
     "groq":         GroqProvider,
     "together":     TogetherProvider,
     "dashscope":    DashScopeProvider,
@@ -68,6 +74,10 @@ _PROVIDER_CLASSES: Dict[str, Type[BaseLLMProvider]] = {
 # 国内环境优先走 DeepSeek / SiliconFlow / DashScope，再尝试 OpenAI / Groq
 _DEFAULT_FALLBACK_CHAIN = [
     ("ollama",       None,                    None),
+    # Before the key-based entries: a signed-in user already has Google
+    # models and should not be asked for a key to reach them. Skipped when
+    # signed out, because the provider reports itself unavailable.
+    ("arthera",      None,                    "google/gemini-3.5-flash"),
     ("deepseek",     "DEEPSEEK_API_KEY",      "deepseek-chat"),
     ("siliconflow",  "SILICONFLOW_API_KEY",   "deepseek-ai/DeepSeek-V3"),
     ("dashscope",    "DASHSCOPE_API_KEY",     "qwen-plus"),

{aria_code-0.153.0 → aria_code-0.155.0/src/aria_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.153.0
+Version: 0.155.0
 Summary: Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves
 License: Apache-2.0
 Project-URL: Homepage, https://github.com/artheras/aria-code
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.153.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.153.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.155.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.155.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.153.0 → aria_code-0.155.0}/src/aria_code.egg-info/SOURCES.txt

@@ -447,6 +447,7 @@ src/aria_code/providers/local_llm_provider.py
 src/aria_code/providers/tool_messages.py
 src/aria_code/providers/llm/__init__.py
 src/aria_code/providers/llm/anthropic.py
+src/aria_code/providers/llm/arthera_gateway.py
 src/aria_code/providers/llm/autoconfig.py
 src/aria_code/providers/llm/base.py
 src/aria_code/providers/llm/custom.py
@@ -565,6 +566,7 @@ tests/test_architecture_report.py
 tests/test_aria_cli_core.py
 tests/test_aria_mcp_server.py
 tests/test_aria_sdk.py
+tests/test_arthera_gateway_provider.py
 tests/test_artifact_publishing.py
 tests/test_artifacts_and_reports.py
 tests/test_ashare_prediction_cmds.py

aria_code-0.155.0/tests/test_arthera_gateway_provider.py

@@ -0,0 +1,109 @@
+"""Google models for a signed-in user, with nothing to configure.
+
+`/login` used to give an identity and no model access: reaching a Google
+model still needed a Gemini API key from AI Studio, or gcloud and a billed
+Google Cloud project. This provider spends the session instead, so the
+question worth holding still is where it gets that session and what it does
+when there is not one.
+"""
+from __future__ import annotations
+
+import json
+import os
+import unittest
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from unittest import mock
+
+from aria_code.providers.llm import arthera_gateway as gw
+from aria_code.providers.llm.base import ProviderConfig
+
+
+class SessionTest(unittest.TestCase):
+    def setUp(self):
+        self.tmp = TemporaryDirectory()
+        self.addCleanup(self.tmp.cleanup)
+        self.dir = Path(self.tmp.name)
+
+    def write_config(self, data: dict):
+        (self.dir / "config.json").write_text(json.dumps(data), encoding="utf-8")
+
+    def test_the_token_login_stored_is_what_authorises_calls(self):
+        self.write_config({"auth_token": "firebase-token"})
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": str(self.dir)}):
+            self.assertEqual(gw.session_token(), "firebase-token")
+
+    def test_signed_out_is_no_token_rather_than_an_empty_one(self):
+        # An empty credential reaches the server and comes back 401, which
+        # tells the user nothing they can act on.
+        self.write_config({"auth_token": None})
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": str(self.dir)}):
+            self.assertIsNone(gw.session_token())
+            self.assertFalse(gw.ArtheraGatewayProvider.available())
+
+    def test_a_missing_config_is_not_an_error(self):
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": str(self.dir / "absent")}):
+            self.assertIsNone(gw.session_token())
+
+    def test_a_corrupt_config_is_not_an_error(self):
+        (self.dir / "config.json").write_text("{ not json", encoding="utf-8")
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": str(self.dir)}):
+            self.assertIsNone(gw.session_token())
+
+    def test_a_signed_in_user_is_available(self):
+        self.write_config({"auth_token": "t"})
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": str(self.dir)}):
+            self.assertTrue(gw.ArtheraGatewayProvider.available())
+
+
+class EndpointTest(unittest.TestCase):
+    def test_the_gateway_is_the_openai_path_on_the_api(self):
+        with mock.patch.dict(os.environ, {"ARIA_API_URL": ""}):
+            self.assertEqual(gw.gateway_base_url(), "https://api.arthera.finance/api/v2/llm/v1")
+
+    def test_another_deployment_is_configuration_not_a_code_change(self):
+        with mock.patch.dict(os.environ, {"ARIA_API_URL": "https://api-staging.example"}):
+            self.assertEqual(gw.gateway_base_url(), "https://api-staging.example/api/v2/llm/v1")
+
+    def test_a_trailing_slash_does_not_double_up(self):
+        with mock.patch.dict(os.environ, {"ARIA_API_URL": "https://api.example/"}):
+            self.assertEqual(gw.gateway_base_url(), "https://api.example/api/v2/llm/v1")
+
+
+class ProviderTest(unittest.TestCase):
+    def setUp(self):
+        self.tmp = TemporaryDirectory()
+        self.addCleanup(self.tmp.cleanup)
+        Path(self.tmp.name, "config.json").write_text(json.dumps({"auth_token": "t"}), encoding="utf-8")
+
+    def test_it_builds_itself_from_the_session_with_nothing_supplied(self):
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": self.tmp.name, "ARIA_API_URL": ""}):
+            provider = gw.ArtheraGatewayProvider(ProviderConfig(name="arthera", model=""))
+        self.assertEqual(provider.config.api_key, "t")
+        self.assertEqual(provider.config.base_url, "https://api.arthera.finance/api/v2/llm/v1")
+
+    def test_an_explicit_base_url_is_respected(self):
+        with mock.patch.dict(os.environ, {"ARIA_CONFIG_DIR": self.tmp.name}):
+            provider = gw.ArtheraGatewayProvider(
+                ProviderConfig(name="arthera", model="", base_url="https://elsewhere.example/v1"))
+        self.assertEqual(provider.config.base_url, "https://elsewhere.example/v1")
+
+
+class RegistryTest(unittest.TestCase):
+    def test_the_provider_is_reachable_by_name(self):
+        from aria_code.providers.llm import registry
+
+        self.assertIn("arthera", registry._PROVIDER_CLASSES)
+
+    def test_it_comes_before_the_providers_that_need_a_key(self):
+        # A signed-in user should not be asked for a key to reach a model
+        # they already have.
+        from aria_code.providers.llm import registry
+
+        names = [entry[0] for entry in registry._DEFAULT_FALLBACK_CHAIN]
+        keyed = [entry[0] for entry in registry._DEFAULT_FALLBACK_CHAIN if entry[1]]
+        self.assertLess(names.index("arthera"), min(names.index(n) for n in keyed))
+
+
+if __name__ == "__main__":
+    unittest.main()

{aria_code-0.153.0 → aria_code-0.155.0}/tests/test_provider_registry.py

@@ -246,14 +246,41 @@ class TestNewProvidersRegistered(unittest.TestCase):
         self.assertLess(sf_idx, oa_idx,
                         "siliconflow 应排在 openai 前面")
 
-    def test_deepseek_first_in_cloud_chain(self):
-        """DeepSeek 应是 fallback 链里第一个云端 provider。"""
+    def test_deepseek_first_among_the_providers_that_need_a_key(self):
+        """DeepSeek 应是第一个需要 API key 的云端 provider。
+
+        这条断言原本写作「第一个云端 provider」，当时每个云端 provider 都要
+        用户自己提供 key，两种说法等价。Arthera 网关打破了这个前提：它是云端
+        的，但凭的是用户已经登录的会话，不需要 key。所以这里要问的是「需要
+        key 的那些里谁第一」——元组第二位就是 key 名，区分本来就在数据里。
+        """
         from aria_code.providers.llm.registry import _PROVIDER_CLASSES
-        cloud_names = [
-            name for name, _, _ in _DEFAULT_FALLBACK_CHAIN
-            if not _PROVIDER_CLASSES[name].local
+        keyed_cloud = [
+            name for name, env_key, _ in _DEFAULT_FALLBACK_CHAIN
+            if env_key and not _PROVIDER_CLASSES[name].local
+        ]
+        self.assertEqual(keyed_cloud[0], "deepseek")
+
+    def test_a_signed_in_user_is_not_asked_for_a_key_first(self):
+        """不需要 key 的云端 provider 要排在需要 key 的之前。
+
+        否则一个已经登录、已经能用 Google 模型的用户，会先被要求去申请一个
+        他并不需要的 key。
+        """
+        from aria_code.providers.llm.registry import _PROVIDER_CLASSES
+        names = [name for name, _, _ in _DEFAULT_FALLBACK_CHAIN]
+        keyless_cloud = [
+            name for name, env_key, _ in _DEFAULT_FALLBACK_CHAIN
+            if not env_key and not _PROVIDER_CLASSES[name].local
+        ]
+        keyed_cloud = [
+            name for name, env_key, _ in _DEFAULT_FALLBACK_CHAIN
+            if env_key and not _PROVIDER_CLASSES[name].local
         ]
-        self.assertEqual(cloud_names[0], "deepseek")
+        for keyless in keyless_cloud:
+            for keyed in keyed_cloud:
+                self.assertLess(names.index(keyless), names.index(keyed),
+                                f"{keyless} 不需要 key，应排在 {keyed} 之前")
 
 
 if __name__ == "__main__":