aria-code 0.157.0__tar.gz → 0.159.0__tar.gz

{aria_code-0.157.0/src/aria_code.egg-info → aria_code-0.159.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.157.0
+Version: 0.159.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.157.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.157.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.159.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.159.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.157.0 → aria_code-0.159.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.157.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.157.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.159.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.159.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.157.0 → aria_code-0.159.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aria-code"
-version = "0.157.0"
+version = "0.159.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.157.0 → aria_code-0.159.0}/src/aria_code/_version.py

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

{aria_code-0.157.0 → aria_code-0.159.0}/src/aria_code/apps/cli/app_server.py

@@ -378,6 +378,10 @@ class Server:
         t = self.terminal
         t._last_turn_envelope = None
         t._last_response = ""
+        # Set by the turn when it has already told the user, in their own
+        # language, what went wrong; cleared here so one turn's answer is
+        # never taken for the next one's.
+        t._error_presented = False
         t.cancel_event = asyncio.Event()
         self.emit("turn.started", prompt=value["text"])
         outcome, error = "completed", ""
@@ -423,7 +427,12 @@ class Server:
                 self.persist()
             except Exception as exc:
                 outcome, error = "failed", f"Session save failed: {exc}"
-            self.emit("turn.completed", status=outcome, error=error, session_id=t.session_id)
+            # `error` stays the raw text for scripts and exec mode. `presented`
+            # tells a human-facing front end it has already been shown, so it
+            # does not print the same failure again under an error heading.
+            self.emit("turn.completed", status=outcome, error=error,
+                      presented=bool(error and getattr(t, "_error_presented", False)),
+                      session_id=t.session_id)
             self.turn_id = None
             self.snapshot("session.state")
 

{aria_code-0.157.0 → aria_code-0.159.0}/src/aria_code/apps/cli/chat_turn.py

@@ -845,6 +845,11 @@ class ChatTurnMixin:
                         ],
                     )
                 console.print() if HAS_RICH else print()
+                # The user has now been told, in their language, what went
+                # wrong. A host that also receives the raw error text (the
+                # native front end gets it in turn.completed) must not show it
+                # a second time under a heading of its own.
+                self._error_presented = True
                 if error_presentation.use_generic_error_prefix:
                     _print_error(error_presentation.lines[0])
                 else:

{aria_code-0.157.0 → aria_code-0.159.0}/src/aria_code/apps/cli/prompts/select.py

@@ -130,8 +130,9 @@ def _general_prompt() -> str:
         f"You are Aria, Arthera's product and software-engineering assistant. "
         f"Today is {today}.\n"
         "You review products, understand repositories, find defects and risks, plan "
-        "architecture, and write and verify code. Finance and sports analysis are "
-        "optional domain capabilities, used only when the user asks for them.\n\n"
+        "architecture, and write and verify code. Specialist domains have their own "
+        "guidance, which is added to a turn only when the user's request is about "
+        "one; never list or offer what you can do unprompted.\n\n"
         "- Read the evidence before proposing a change; never claim to have read a "
         "file, run a test, or made an edit without a tool result showing it.\n"
         "- State the scope before a change and the verification after it.\n"

{aria_code-0.157.0 → aria_code-0.159.0}/src/aria_code/apps/cli/providers/llm/ollama_stream.py

@@ -268,6 +268,50 @@ def _skill_tool_schema_allowed(schema: dict, allowed_names: set[str]) -> bool:
     return False
 
 
+def _general_turn_prompt(message: str, history: list | None = None) -> str:
+    """System prompt for a knowledge or conversational turn on a local model.
+
+    This used to be one hard-coded Chinese prompt that opened by listing what
+    Aria can do — "金融量化分析、足球/体育赛事分析与预测（含泊松算法）、编程" —
+    and then gave a long section of football and Poisson rules, for every
+    general turn. A small local model told that will offer it back, so a bare
+    你好 was answered with "是关于足球赛事还是其他方面的问题呢？".
+
+    The sports rules only mean anything when sports data is attached to the
+    message, so they are added for a sports query — the same test the sports
+    data path uses — or when the conversation already holds a prediction block
+    the model has to keep treating as fact ("那加拿大呢?" is not a sports query
+    by itself, but it is still about the match above it). Everything else gets
+    the neutral prompt every other general turn already uses.
+    """
+    from aria_code.apps.cli.prompts.select import _general_prompt
+
+    prompt = _general_prompt()
+    if _is_sports_query(message) or _recent_sports_quant_context(history or []):
+        prompt += (
+            "\n\n"
+            "## 体育量化分析规则（重要）\n"
+            "用户消息中可能包含两种特殊数据块：\n\n"
+            "### 【比赛信息】块\n"
+            "= football-data.org API 获取的真实赛程（比赛时间、状态、比分）。这是**事实**，不要质疑。\n\n"
+            "### 【泊松模型量化预测】块\n"
+            "= Aria 用 Dixon-Coles 泊松算法计算的量化结果，包含：\n"
+            "  - 两队 FIFA 排名强度参数（进攻/防守）\n"
+            "  - 预期进球数（λ值）\n"
+            "  - 主胜/平局/客胜概率（%）\n"
+            "  - 最可能比分及其概率\n"
+            "  - 隐含赔率\n"
+            "当收到此块时，你应当：\n"
+            "1. **直接引用数字**（「算法显示加拿大胜率 42.4%」），不要重新计算或质疑\n"
+            "2. **解释概率背后的逻辑**：FIFA 排名差距、进攻强度对比说明了什么\n"
+            "3. **分析高频比分区间**：比如 1-0/1-1/2-1 集中说明比赛预计紧张胶着\n"
+            "4. **补充战术/球员层面的定性分析**（这是你的训练知识，算法没有的部分）\n"
+            "5. **绝对不要**说「我没有实时数据」「世界杯尚未开始」「不包含实时数据」「以上预测基于历史」——这些与上方数据矛盾\n"
+            "6. **绝对不要**在末尾添加「若需最新数据请使用/football命令」之类的建议——用户已经有数据了\n\n"
+        )
+    return prompt
+
+
 async def stream_ollama(ollama_url: str, message: str, history: list,
                         model: str = "qwen2.5:7b",
                         on_token=None, on_thinking=None,
@@ -545,36 +589,8 @@ async def stream_ollama(ollama_url: str, message: str, history: list,
             else _build_analysis_prompt_lite(_intent_message)
         )
     elif _intent == "general":
-        # 纯知识/概念问题：注入日期，但不注入工具 schema
-        from datetime import datetime as _dt2
-        _today = _dt2.now()
-        _today_str = f"{_today.year:04d}年{_today.month:02d}月{_today.day:02d}日"
-        _base_prompt = (
-            f"你是 Aria，Arthera 的 AI 助手。今天是 {_today_str}。\n"
-            "你的能力覆盖：金融量化分析、足球/体育赛事分析与预测（含泊松算法）、编程、通用知识问答。\n\n"
-            "## 体育量化分析规则（重要）\n"
-            "用户消息中可能包含两种特殊数据块：\n\n"
-            "### 【比赛信息】块\n"
-            "= football-data.org API 获取的真实赛程（比赛时间、状态、比分）。这是**事实**，不要质疑。\n\n"
-            "### 【泊松模型量化预测】块\n"
-            "= Aria 用 Dixon-Coles 泊松算法计算的量化结果，包含：\n"
-            "  - 两队 FIFA 排名强度参数（进攻/防守）\n"
-            "  - 预期进球数（λ值）\n"
-            "  - 主胜/平局/客胜概率（%）\n"
-            "  - 最可能比分及其概率\n"
-            "  - 隐含赔率\n"
-            "当收到此块时，你应当：\n"
-            "1. **直接引用数字**（「算法显示加拿大胜率 42.4%」），不要重新计算或质疑\n"
-            "2. **解释概率背后的逻辑**：FIFA 排名差距、进攻强度对比说明了什么\n"
-            "3. **分析高频比分区间**：比如 1-0/1-1/2-1 集中说明比赛预计紧张胶着\n"
-            "4. **补充战术/球员层面的定性分析**（这是你的训练知识，算法没有的部分）\n"
-            "5. **绝对不要**说「我没有实时数据」「世界杯尚未开始」「不包含实时数据」「以上预测基于历史」——这些与上方数据矛盾\n"
-            "6. **绝对不要**在末尾添加「若需最新数据请使用/football命令」之类的建议——用户已经有数据了\n\n"
-            "## 通用规则\n"
-            "- 使用 Markdown（**粗体**、## 标题、- 列表、表格）\n"
-            "- 不要编造股价/汇率等金融数字\n"
-            "- 简洁精准，用数据说话\n"
-        )
+        # 纯知识/概念问题：不注入工具 schema
+        _base_prompt = _general_turn_prompt(_intent_message, history)
     else:
         # realtime / finance: use full finance prompt with tool access
         _base_prompt = _finance_prompt

{aria_code-0.157.0 → aria_code-0.159.0/src/aria_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.157.0
+Version: 0.159.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.157.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.157.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.159.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.159.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.157.0 → aria_code-0.159.0}/src/aria_code.egg-info/SOURCES.txt

@@ -668,6 +668,7 @@ tests/test_football_agent.py
 tests/test_football_prediction_output.py
 tests/test_frozen_module_aliases.py
 tests/test_gemini_retirement.py
+tests/test_general_turn_prompt.py
 tests/test_google_cloud_models.py
 tests/test_google_cloud_routing.py
 tests/test_google_login.py

aria_code-0.159.0/tests/test_general_turn_prompt.py

@@ -0,0 +1,68 @@
+"""A plain greeting on a local model is not answered with an offer of football.
+
+On the Ollama path every general turn used to get one hard-coded prompt that
+opened by listing what Aria can do — financial quant analysis, football and
+sports prediction with a Poisson model, programming — and then a long section
+of rules for sports data blocks. A small model told that offers it back: a bare
+你好 was answered with "是关于足球赛事还是其他方面的问题呢？如果您有具体的
+【泊松模型量化预测】块…", after sixteen seconds, to someone who had asked for
+nothing of the kind.
+
+The sports rules only mean something when sports data is attached to the
+message, so they are now added only for a sports query.
+"""
+import pytest
+
+from aria_code.apps.cli.providers.llm.ollama_stream import _general_turn_prompt
+
+SPECIALIST = ("足球", "泊松", "football", "poisson", "量化", "金融", "sports")
+
+
+@pytest.mark.parametrize("message", [
+    "你好", "Hello!", "谢谢", "what is a reorder point?", "解释一下什么是闭包",
+    "帮我想一个产品名字", "今天心情不错",
+])
+def test_an_ordinary_turn_is_not_told_about_any_specialist_domain(message):
+    prompt = _general_turn_prompt(message).lower()
+    for word in SPECIALIST:
+        assert word.lower() not in prompt, (message, word)
+
+
+def test_an_ordinary_turn_still_has_a_date_and_the_rules_every_turn_gets():
+    prompt = _general_turn_prompt("你好")
+    assert "Today is" in prompt
+    assert "Answer in the user's language" in prompt
+
+
+@pytest.mark.parametrize("message", [
+    "世界杯 加拿大 vs 波黑 预测", "英超积分榜",
+])
+def test_a_sports_question_still_gets_the_sports_rules(message):
+    # Narrowing the default must not remove what a real sports turn needs.
+    prompt = _general_turn_prompt(message)
+    assert "【泊松模型量化预测】" in prompt
+    assert "不要质疑" in prompt
+
+
+def test_the_sports_rules_are_added_to_the_neutral_prompt_not_instead_of_it():
+    prompt = _general_turn_prompt("世界杯 加拿大 vs 波黑 预测")
+    assert prompt.startswith(_general_turn_prompt("你好")), "the neutral part comes first"
+
+
+def test_a_follow_up_in_a_sports_thread_keeps_the_rules_for_the_block_above_it():
+    # "那加拿大呢?" is not a sports query on its own, but the history still
+    # holds the prediction block the model has to keep treating as fact.
+    history = [
+        {"role": "user", "content": "世界杯 加拿大 vs 波黑 预测"},
+        {"role": "assistant", "content": "【泊松模型量化预测】\n预期进球 1.4 : 0.9\n最可能比分 1-0"},
+    ]
+    assert "不要质疑" in _general_turn_prompt("那加拿大呢?", history)
+
+
+def test_a_greeting_after_a_sports_thread_gets_the_rules_too_which_is_the_cost():
+    # The history check cannot tell a follow-up from a change of subject, so a
+    # 你好 inside a sports thread is still told about the block. Contained to
+    # conversations that actually hold one, which is the point of the change.
+    history = [{"role": "assistant", "content": "【泊松模型量化预测】预期进球 1.4 最可能比分 1-0"}]
+    assert "不要质疑" in _general_turn_prompt("你好", history)
+    assert "不要质疑" not in _general_turn_prompt("你好", [{"role": "user", "content": "hi"}])

{aria_code-0.157.0 → aria_code-0.159.0}/tests/test_native_app.py

@@ -575,3 +575,32 @@ def test_new_session_drops_temporary_file_write_grant(application):
     c.send('dialog.respond', turn_id='fresh', request_id=menu['request_id'], choice=-1)
     c.until('turn.completed')
     c.close()
+
+
+@pytest.mark.parametrize("native", [False, True])
+def test_a_failure_the_worker_already_explained_is_marked_as_presented(application, native):
+    # One failed check reached the screen three times: a status line, the
+    # worker's explanation in the user's language, and the raw error — with
+    # its internal code — under a red heading, because turn.completed always
+    # carried the raw text and the front end always printed it. The worker now
+    # says when it has already told the user; `error` itself stays the raw text
+    # for scripts and exec mode.
+    start, _, _, _ = application
+    c = start(native=native)
+    c.send("turn.submit", turn_id="finance", text="分析苹果股票走势和成交量")
+    done = c.until("turn.completed")
+    assert "ARIA-4223" in done["error"], done
+    assert done["presented"] is True, done
+    c.close()
+
+
+@pytest.mark.parametrize("native", [False, True])
+def test_a_turn_that_succeeds_is_not_marked_as_presented(application, native):
+    start, _, _, _ = application
+    c = start(native=native)
+    c.send("turn.submit", turn_id="hello", text="你好")
+    done = c.until("turn.completed")
+    assert done["status"] == "ok"
+    assert not done.get("error")
+    assert done["presented"] is False
+    c.close()

{aria_code-0.157.0 → aria_code-0.159.0}/tests/test_output_discipline_prompt.py

@@ -48,3 +48,25 @@ def test_a_general_question_keeps_the_general_prompt(tmp_path, monkeypatch):
 
 def test_an_override_is_left_alone():
     assert build_turn_system_prompt("x", override="only this") == "only this"
+
+
+def test_a_greeting_prompt_does_not_name_a_specialist_domain():
+    # The general prompt used to say "Finance and sports analysis are optional
+    # domain capabilities, used only when the user asks for them." Meant as
+    # neutrality, it did the opposite: a model told about two named
+    # capabilities offers them back, and a plain 你好 was answered with an offer
+    # of football and quantitative analysis. Specialist guidance is added by
+    # the packs a message activates, so the general prompt has no reason to
+    # name any domain.
+    from aria_code.apps.cli.prompts.select import _general_prompt
+
+    prompt = _general_prompt().lower()
+    for domain in ("finance", "sports", "football", "quant", "stock", "trading", "market"):
+        assert domain not in prompt, domain
+    assert "never list or offer" in prompt
+
+
+def test_a_greeting_gets_the_general_prompt_not_a_domain_one():
+    prompt = build_turn_system_prompt("你好")
+    assert "quantitative" not in prompt.lower()
+    assert "football" not in prompt.lower()