avrae-ls 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

avrae_ls/__main__.py

@@ -42,6 +42,8 @@ def main(argv: list[str] | None = None) -> None:
         const=".",
         help="Run alias tests in PATH (defaults to current directory)",
     )
+    parser.add_argument("--token", help="Avrae API token (overrides config)")
+    parser.add_argument("--base-url", help="Avrae API base URL (overrides config)")
     parser.add_argument("--version", action="store_true", help="Print version and exit")
     args = parser.parse_args(argv)
 
@@ -56,12 +58,12 @@ def main(argv: list[str] | None = None) -> None:
             parser.error("--run-tests cannot be combined with --tcp")
         if args.analyze:
             parser.error("--run-tests cannot be combined with --analyze")
-        sys.exit(_run_alias_tests(Path(args.run_tests)))
+        sys.exit(_run_alias_tests(Path(args.run_tests), token_override=args.token, base_url_override=args.base_url))
 
     if args.analyze:
         if args.tcp:
             parser.error("--analyze cannot be combined with --tcp")
-        sys.exit(_run_analysis(Path(args.analyze)))
+        sys.exit(_run_analysis(Path(args.analyze), token_override=args.token, base_url_override=args.base_url))
 
     server = create_server()
     if args.tcp:
@@ -80,7 +82,7 @@ def _configure_logging(level: str) -> None:
     )
 
 
-def _run_analysis(path: Path) -> int:
+def _run_analysis(path: Path, *, token_override: str | None = None, base_url_override: str | None = None) -> int:
     if not path.exists():
         print(f"File not found: {path}", file=sys.stderr)
         return 2
@@ -90,6 +92,10 @@ def _run_analysis(path: Path) -> int:
     log.info("Analyzing %s (workspace root: %s)", path, workspace_root)
 
     config, warnings = load_config(workspace_root, default_enable_gvar_fetch=True)
+    if token_override:
+        config.service.token = token_override
+    if base_url_override:
+        config.service.base_url = base_url_override
     for warning in warnings:
         log.warning(warning)
 
@@ -104,7 +110,9 @@ def _run_analysis(path: Path) -> int:
     return 1 if results else 0
 
 
-def _run_alias_tests(target: Path) -> int:
+def _run_alias_tests(
+    target: Path, *, token_override: str | None = None, base_url_override: str | None = None
+) -> int:
     if not target.exists():
         print(f"Test path not found: {target}", file=sys.stderr)
         return 2
@@ -114,6 +122,10 @@ def _run_alias_tests(target: Path) -> int:
     log.info("Running alias tests in %s (workspace root: %s)", target, workspace_root)
 
     config, warnings = load_config(workspace_root, default_enable_gvar_fetch=True)
+    if token_override:
+        config.service.token = token_override
+    if base_url_override:
+        config.service.base_url = base_url_override
     for warning in warnings:
         log.warning(warning)
 

avrae_ls/config.py

@@ -393,9 +393,6 @@ def load_config(workspace_root: Path, *, default_enable_gvar_fetch: bool = False
     if not path.exists():
         cfg = AvraeLSConfig.default(workspace_root)
         cfg.enable_gvar_fetch = default_enable_gvar_fetch
-        env_token = _coerce_optional_str(os.environ.get("AVRAE_TOKEN"))
-        if env_token:
-            cfg.service.token = env_token
         return cfg, []
 
     try:
@@ -419,10 +416,9 @@ def load_config(workspace_root: Path, *, default_enable_gvar_fetch: bool = False
     enable_gvar_fetch = bool(raw.get("enableGvarFetch", default_enable_gvar_fetch))
 
     service_cfg = raw.get("avraeService") or {}
-    env_token = _coerce_optional_str(env.get("AVRAE_TOKEN"))
     service = AvraeServiceConfig(
         base_url=str(service_cfg.get("baseUrl") or AvraeServiceConfig.base_url),
-        token=_coerce_optional_str(service_cfg.get("token")) or env_token,
+        token=_coerce_optional_str(service_cfg.get("token")),
     )
 
     diag_cfg = raw.get("diagnostics") or {}

avrae_ls/context.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import json
-import logging
 import asyncio
 import copy
+import json
+import logging
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, Iterable
@@ -320,6 +320,7 @@ class GVarResolver:
         return True
 
 
+
 def _read_json_file(path: Path) -> Dict[str, Any] | None:
     try:
         text = path.read_text()

{avrae_ls-0.6.3.dist-info → avrae_ls-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrae-ls
-Version: 0.6.3
+Version: 0.6.4
 Summary: Language server for Avrae draconic aliases
 Author: 1drturtle
 License: MIT License

{avrae_ls-0.6.3.dist-info → avrae_ls-0.6.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 avrae_ls/__init__.py,sha256=BmjrnksGkbG7TPqwbyQvgYj9uei8pFSFpfkRpaGVdJU,63
-avrae_ls/__main__.py,sha256=26-co4IX3pbi6dQNn_ZSOWi7upjTCGFqu0UMBTDmzJQ,8700
+avrae_ls/__main__.py,sha256=mQDiR442RLEy2M-aO1XyBpGwInBuHszyjKhkYqjsyOo,9434
 avrae_ls/alias_preview.py,sha256=pSDTZVmcZZbUqCxyCryVWFSGdN8p0fLkR4IqbHxgNMs,12376
 avrae_ls/alias_tests.py,sha256=JFaWApVqxsHoF4QDm98kbYZRPTy5_QhsmUJq2kWV_I4,11917
 avrae_ls/api.py,sha256=7QVJAmqgKkiS22qj39_aSVsDuO_kUkyl2Ho1IsD58yE,65110
@@ -8,8 +8,8 @@ avrae_ls/argument_parsing.py,sha256=ezKl65VwuNEDxt6KlYwVQcpy1110UDvf4BqZqgZTcqk,
 avrae_ls/code_actions.py,sha256=CYl3nMzCaE9k35p5fWAmzsTOVfcv2RrkA3SbtyCdcsI,9423
 avrae_ls/codes.py,sha256=iPRPQ6i9DZheae4_ra1y29vCw3Y4SEu6Udf5WiZj_RY,136
 avrae_ls/completions.py,sha256=FO9LCT1E5upSr23j0lUa_h_J1QN7ET9Yl_jLcWE97m0,64023
-avrae_ls/config.py,sha256=B_WqsF2lWKsalWoEhogL9sxSym9r-XcPuo_Uyi27cl0,16984
-avrae_ls/context.py,sha256=c18vdkuxKlPjPIogtWhJjbuynKLmgybD-VUkG46ooKM,12205
+avrae_ls/config.py,sha256=NaCzeFFrZKMRXe66zeX6HnQSYypJ51g0mCKbjwl_39Y,16774
+avrae_ls/context.py,sha256=rZfOHllDpyUoyj030bOXuKIN-WCkVMw6yGonMB82A4o,12206
 avrae_ls/cvars.py,sha256=0tcVbUHx_CKJ6aou3kEsKX37LRWAjkUWlqqIuSRFlXk,3197
 avrae_ls/diagnostics.py,sha256=x5sZmpgje3G6UfOub2nQFv10lfjTb_7Qn_2SjqiGfLY,28072
 avrae_ls/dice.py,sha256=DY7V7L-EwAXaCgddgVe9xU1s9lVtiw5Zc2reipNgdTk,874
@@ -27,8 +27,8 @@ draconic/string.py,sha256=kGrRc6wNHRq1y5xw8Os-fBhfINDtIY2nBWQWkyLSfQI,2858
 draconic/types.py,sha256=1Lsr6z8bW5agglGI4hLt_nPtYuZOIf_ueSpPDB4WDrs,13686
 draconic/utils.py,sha256=D4vJ-txqS2-rlqsEpXAC46_j1sZX4UjY-9zIgElo96k,3122
 draconic/versions.py,sha256=CUEsgUWjAmjez0432WwiBwZlIzWPIObwZUf8Yld18EE,84
-avrae_ls-0.6.3.dist-info/METADATA,sha256=bsfrz-tgTyzJthbXIbiyVDmS2cAa96qtP3e53FsMaNI,7163
-avrae_ls-0.6.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-avrae_ls-0.6.3.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
-avrae_ls-0.6.3.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-avrae_ls-0.6.3.dist-info/RECORD,,
+avrae_ls-0.6.4.dist-info/METADATA,sha256=d5r8kg3YABMSeRjp5Up7exesPQKtfxhm6V9T6ALRHfo,7163
+avrae_ls-0.6.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+avrae_ls-0.6.4.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
+avrae_ls-0.6.4.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+avrae_ls-0.6.4.dist-info/RECORD,,