assistant 2.2.0a2__tar.gz → 2.2.0a4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (110) hide show
  1. {assistant-2.2.0a2/assistant.egg-info → assistant-2.2.0a4}/PKG-INFO +1 -1
  2. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/__init__.py +1 -1
  3. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/shell.py +44 -20
  4. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/setup_wizard.py +24 -18
  5. {assistant-2.2.0a2 → assistant-2.2.0a4/assistant.egg-info}/PKG-INFO +1 -1
  6. {assistant-2.2.0a2 → assistant-2.2.0a4}/xontrib/assistant.py +1 -1
  7. {assistant-2.2.0a2 → assistant-2.2.0a4}/LICENSE +0 -0
  8. {assistant-2.2.0a2 → assistant-2.2.0a4}/MANIFEST.in +0 -0
  9. {assistant-2.2.0a2 → assistant-2.2.0a4}/README.md +0 -0
  10. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/__main__.py +0 -0
  11. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/agent.py +0 -0
  12. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/as_client.py +0 -0
  13. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/as_service.py +0 -0
  14. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/builtin_cmds.py +0 -0
  15. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/codecache.py +0 -0
  16. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/compress.py +0 -0
  17. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/conditions.py +0 -0
  18. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/config.py +0 -0
  19. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/entry_points/__init__.py +0 -0
  20. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/entry_points/run_assistant.py +0 -0
  21. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/envindex.py +0 -0
  22. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/execer.py +0 -0
  23. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/history.py +0 -0
  24. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/listen/__init__.py +0 -0
  25. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/listen/__main__.py +0 -0
  26. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/listen/interface.py +0 -0
  27. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/listen/main.py +0 -0
  28. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/main.py +0 -0
  29. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/memory.py +0 -0
  30. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/__init__.py +0 -0
  31. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/clear.py +0 -0
  32. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/exit.py +0 -0
  33. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/http_client.py +0 -0
  34. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/interface.py +0 -0
  35. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/message.py +0 -0
  36. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/__init__.py +0 -0
  37. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/google.py +0 -0
  38. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/llama_cpp.py +0 -0
  39. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/nim.py +0 -0
  40. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/ollama.py +0 -0
  41. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/openai.py +0 -0
  42. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/openrouter.py +0 -0
  43. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/providers/vllm.py +0 -0
  44. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/think.py +0 -0
  45. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/nlp/xonsh.py +0 -0
  46. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/parser.py +0 -0
  47. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/projectfile.py +0 -0
  48. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/__init__.py +0 -0
  49. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/bindings.py +0 -0
  50. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/completer.py +0 -0
  51. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/dialogs.py +0 -0
  52. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/floats.py +0 -0
  53. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/layout.py +0 -0
  54. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/operators.py +0 -0
  55. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/strformat_utils.py +0 -0
  56. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/styles.py +0 -0
  57. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/ptk_shell/windows.py +0 -0
  58. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/say/__init__.py +0 -0
  59. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/say/interface.py +0 -0
  60. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/time.py +0 -0
  61. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/tools.py +0 -0
  62. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/tools_worker.py +0 -0
  63. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/traces/__init__.py +0 -0
  64. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/traces/cmd.py +0 -0
  65. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/traces/export.py +0 -0
  66. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/traces/schema.py +0 -0
  67. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/traces/store.py +0 -0
  68. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/utils.py +0 -0
  69. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/version.py +0 -0
  70. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant/vocabulary.py +0 -0
  71. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant.egg-info/SOURCES.txt +0 -0
  72. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant.egg-info/dependency_links.txt +0 -0
  73. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant.egg-info/entry_points.txt +0 -0
  74. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant.egg-info/requires.txt +0 -0
  75. {assistant-2.2.0a2 → assistant-2.2.0a4}/assistant.egg-info/top_level.txt +0 -0
  76. {assistant-2.2.0a2 → assistant-2.2.0a4}/pyproject.toml +0 -0
  77. {assistant-2.2.0a2 → assistant-2.2.0a4}/setup.cfg +0 -0
  78. {assistant-2.2.0a2 → assistant-2.2.0a4}/setup.py +0 -0
  79. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_bindings.py +0 -0
  80. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_builtin_cmds.py +0 -0
  81. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_compaction.py +0 -0
  82. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_compress.py +0 -0
  83. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_config.py +0 -0
  84. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_envindex.py +0 -0
  85. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_envindex_suggestions.py +0 -0
  86. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_git_hook.py +0 -0
  87. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_history_bridge.py +0 -0
  88. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_http_client.py +0 -0
  89. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_init.py +0 -0
  90. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_interrupt.py +0 -0
  91. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_interrupt_real.py +0 -0
  92. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_listen_interrupt.py +0 -0
  93. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_memory.py +0 -0
  94. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_memory_sqlite.py +0 -0
  95. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_model_compare.py +0 -0
  96. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_projectfile.py +0 -0
  97. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_setup_wizard.py +0 -0
  98. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_startup_performance.py +0 -0
  99. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_tmux_interactive.py +0 -0
  100. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_tool_handling.py +0 -0
  101. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_tools.py +0 -0
  102. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_traces_agent.py +0 -0
  103. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_traces_cmd.py +0 -0
  104. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_traces_export.py +0 -0
  105. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_traces_schema.py +0 -0
  106. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_traces_store.py +0 -0
  107. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_tts_streaming.py +0 -0
  108. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_utils.py +0 -0
  109. {assistant-2.2.0a2 → assistant-2.2.0a4}/tests/test_xontrib.py +0 -0
  110. {assistant-2.2.0a2 → assistant-2.2.0a4}/xontrib/__init__.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: assistant
3
- Version: 2.2.0a2
3
+ Version: 2.2.0a4
4
4
  Summary: Your very own Assistant. Because you deserve it.
5
5
  Home-page: https://gitlab.com/waser-technologies/technologies/assistant
6
6
  Author: Danny Waser
@@ -5,7 +5,7 @@ import warnings
5
5
  warnings.filterwarnings("ignore", category=DeprecationWarning, module="webrtcvad")
6
6
  warnings.filterwarnings("ignore", category=UserWarning, module="webrtcvad")
7
7
 
8
- __version__ = "2.2.0a2"
8
+ __version__ = "2.2.0a4"
9
9
 
10
10
  USERNAME = os.environ.get("USER", "root")
11
11
  HOME = os.environ.get("HOME", f"/home/{USERNAME}" if USERNAME != "root" else "/root")
@@ -1577,27 +1577,51 @@ class AssistantShell(PromptToolkitShell):
1577
1577
  hist.last_cmd_rtn = 0
1578
1578
 
1579
1579
  return response or ""
1580
-
1581
- def _try_builtin(self, line):
1582
- """Try to dispatch a built-in command. Returns True if handled."""
1583
- stripped = line.strip()
1584
- if not stripped:
1585
- return False
1586
- m = re.match(r"^(\S+)\s*(.*)", stripped, re.DOTALL)
1587
- if not m:
1588
- return False
1589
- cmd_name = m.group(1).lower()
1590
- if cmd_name in BUILTIN_COMMANDS:
1591
- cmd_info = BUILTIN_COMMANDS[cmd_name]
1592
- fn = cmd_info.get("fn")
1593
- if fn is not None:
1594
- rest = m.group(2).strip()
1595
- if rest:
1596
- fn(rest.split())
1597
- else:
1598
- fn([])
1599
- return True
1580
+ def _try_builtin(self, line):
1581
+ """Try to dispatch a built-in command. Returns True if handled."""
1582
+ stripped = line.strip()
1583
+ if not stripped:
1600
1584
  return False
1585
+ m = re.match(r"^(\S+)\s*(.*)", stripped, re.DOTALL)
1586
+ if not m:
1587
+ return False
1588
+ cmd_name = m.group(1).lower()
1589
+ if cmd_name in BUILTIN_COMMANDS:
1590
+ cmd_info = BUILTIN_COMMANDS[cmd_name]
1591
+ fn = cmd_info.get("fn")
1592
+ if fn is not None:
1593
+ # Reset terminal to a clean state before running the builtin.
1594
+ # prompt_toolkit's Application leaves the cursor at the prompt
1595
+ # position and may have the terminal in raw mode or with
1596
+ # modifyOtherKeys enabled. A nested prompt_toolkit app (e.g.
1597
+ # questionary in the wizard) will mis-render if the terminal
1598
+ # state is not reset first.
1599
+ try:
1600
+ import sys
1601
+ import tty
1602
+ import termios
1603
+
1604
+ fd = sys.stdin.fileno()
1605
+ # Disable modifyOtherKeys (mode 4) if enabled.
1606
+ sys.stdout.write("\x1b[>4;0m")
1607
+ sys.stdout.flush()
1608
+ # Reset terminal attributes to a known state (cooked mode,
1609
+ # echo on, etc.) so the nested app starts clean.
1610
+ try:
1611
+ attrs = termios.tcgetattr(fd)
1612
+ tty.setcookes(fd)
1613
+ except Exception:
1614
+ pass
1615
+ except Exception:
1616
+ pass
1617
+
1618
+ rest = m.group(2).strip()
1619
+ if rest:
1620
+ fn(rest.split())
1621
+ else:
1622
+ fn([])
1623
+ return True
1624
+ return False
1601
1625
 
1602
1626
  def singleline(
1603
1627
  self, auto_suggest=None, enable_history_search=True, multiline=True, **kwargs
@@ -98,6 +98,15 @@ def load_existing_config(config_path: Optional[str] = None) -> bool:
98
98
  return False
99
99
 
100
100
 
101
+ def _confirm_exit_without_saving() -> bool:
102
+ """Ask the user to confirm exiting without saving.
103
+
104
+ Returns True if the user confirms, False if they cancel.
105
+ """
106
+ return questionary.confirm(
107
+ "Are you sure you want to exit without saving?", default=False
108
+ ).ask()
109
+
101
110
  def run_main_menu() -> bool:
102
111
  """Main interactive menu for configuration management."""
103
112
  cfg = get_config(force_reload=False)
@@ -150,18 +159,16 @@ def run_main_menu() -> bool:
150
159
  console.print(f"[bold green]Configuration saved to {cfg.path}[/bold green]")
151
160
  return True
152
161
  elif choice == "Exit Without Saving ([Ctrl] + [C])":
153
- choice = None
154
-
155
- if choice is None:
156
- print("You are about to loose all your changes.")
157
- confirm = questionary.confirm(
158
- "Are you sure you want to exit without saving?", default=False
159
- ).ask()
160
- if confirm:
162
+ # Explicit menu item: confirm once, then exit (or re-ask if cancelled).
163
+ if _confirm_exit_without_saving():
161
164
  return False
162
- else:
163
- continue
164
-
165
+ continue
166
+ elif choice is None:
167
+ # Ctrl+C in a menu: treat as "exit without saving" (with confirmation)
168
+ # instead of re-asking forever.
169
+ if _confirm_exit_without_saving():
170
+ return False
171
+ continue
165
172
 
166
173
  def manage_providers(cfg) -> None:
167
174
  """Manage LLM providers."""
@@ -173,18 +180,19 @@ def manage_providers(cfg) -> None:
173
180
  p = providers[p_id]
174
181
  ep = p.get("endpoint", "N/A")
175
182
 
176
- # Show credential hint
183
+ # Show credential hint (plain text: questionary choices are not
184
+ # rendered by Rich, so markup tags would leak into the prompt).
177
185
  cred = p.get("credential", "")
178
186
  if cred.startswith("keyring:"):
179
- cred_display = "[dim](keyring)[/dim]"
187
+ cred_display = "(keyring)"
180
188
  elif cred == "" and cfg._check_env_cred(p_id):
181
- cred_display = "[dim](env)[/dim]"
189
+ cred_display = "(env)"
182
190
  elif len(cred) > 10:
183
- cred_display = f"[dim]({cred[:10]}...)[/dim]"
191
+ cred_display = f"({cred[:10]}...)"
184
192
  else:
185
193
  cred_display = ""
186
194
 
187
- choices.append(f"Edit: {p_id} ({ep}) {cred_display}")
195
+ choices.append(f"Edit: {p_id} ({ep}) {cred_display}".rstrip())
188
196
 
189
197
  choice = questionary.select("Provider Settings", choices=choices).ask()
190
198
 
@@ -196,8 +204,6 @@ def manage_providers(cfg) -> None:
196
204
  # Extract p_id from the choice string (the part after 'Edit: ')
197
205
  p_id = choice.replace("Edit: ", "").split(" ")[0]
198
206
  edit_provider(cfg, p_id)
199
-
200
-
201
207
  def add_provider(cfg) -> None:
202
208
  """Add a new provider."""
203
209
  provider_choice = questionary.select(
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: assistant
3
- Version: 2.2.0a2
3
+ Version: 2.2.0a4
4
4
  Summary: Your very own Assistant. Because you deserve it.
5
5
  Home-page: https://gitlab.com/waser-technologies/technologies/assistant
6
6
  Author: Danny Waser
@@ -317,7 +317,7 @@ try:
317
317
 
318
318
  cfg = get_config()
319
319
  if not cfg.exists():
320
- from assistant.setup_wizard import get_setup_wizard
320
+ from assistant.main import get_setup_wizard
321
321
 
322
322
  print("Assistant configuration not found. Running setup wizard...")
323
323
  wizard = get_setup_wizard()
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes