avrae-ls 0.7.1__py3-none-any.whl → 0.8.1__py3-none-any.whl

avrae_ls/context.py

@@ -14,6 +14,7 @@ from .config import AvraeLSConfig, ContextProfile, VarSources
 from .cvars import derive_character_cvars
 
 log = logging.getLogger(__name__)
+_SKIP_GVAR = object()
 
 
 @dataclass
@@ -63,7 +64,7 @@ class ContextBuilder:
             data = _read_json_file(path)
             if data is None:
                 continue
-            merged = merged.merge(VarSources.from_data(data))
+            merged = merged.merge(_var_sources_from_file(path, data))
         return merged
 
     def _merge_character_cvars(self, character: Dict[str, Any], vars: VarSources) -> VarSources:
@@ -366,3 +367,49 @@ def _read_json_file(path: Path) -> Dict[str, Any] | None:
     except json.JSONDecodeError as exc:
         log.warning("Failed to parse var file %s: %s", path, exc)
         return None
+
+
+def _var_sources_from_file(path: Path, data: Dict[str, Any]) -> VarSources:
+    parsed = VarSources.from_data(data)
+    return VarSources(
+        cvars=parsed.cvars,
+        uvars=parsed.uvars,
+        svars=parsed.svars,
+        gvars=_resolve_gvar_file_refs(path, parsed.gvars),
+    )
+
+
+def _resolve_gvar_file_refs(var_file: Path, gvars: Dict[str, Any]) -> Dict[str, Any]:
+    resolved: dict[str, Any] = {}
+    for key, value in gvars.items():
+        parsed = _parse_gvar_value(var_file, key, value)
+        if parsed is _SKIP_GVAR:
+            continue
+        resolved[str(key)] = parsed
+    return resolved
+
+
+def _parse_gvar_value(var_file: Path, key: Any, value: Any) -> Any:
+    if not isinstance(value, dict):
+        return value
+
+    file_path = value.get("filePath")
+    if file_path is None:
+        file_path = value.get("path")
+    if file_path is None:
+        return value
+    if not isinstance(file_path, str) or not file_path.strip():
+        log.warning("Invalid gvar file path for '%s' in %s; expected a non-empty string.", key, var_file)
+        return _SKIP_GVAR
+
+    gvar_path = Path(file_path)
+    if not gvar_path.is_absolute():
+        gvar_path = var_file.parent / gvar_path
+    try:
+        return gvar_path.read_text()
+    except FileNotFoundError:
+        log.warning("Gvar content file not found for '%s': %s", key, gvar_path)
+        return _SKIP_GVAR
+    except OSError as exc:
+        log.warning("Failed to read gvar content file for '%s' (%s): %s", key, gvar_path, exc)
+        return _SKIP_GVAR

{avrae_ls-0.7.1.dist-info → avrae_ls-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrae-ls
-Version: 0.7.1
+Version: 0.8.1
 Summary: Language server for Avrae draconic aliases
 Author: 1drturtle
 License: MIT License
@@ -40,6 +40,8 @@ Description-Content-Type: text/markdown
 
 # Avrae Draconic Alias Language Server
 
+[![Tests](https://github.com/1drturtle/avrae-ls/actions/workflows/ci.yml/badge.svg)](https://github.com/1drturtle/avrae-ls/actions/workflows/ci.yml)
+
 Language Server Protocol (LSP) implementation targeting Avrae-style draconic aliases. It provides syntax/semantic diagnostics, a mocked execution command, and a thin configuration layer driven by a workspace `.avraels.json` file. Credit to Avrae team for all code yoinked!
 
 ## Install (released package)
@@ -105,12 +107,12 @@ Language Server Protocol (LSP) implementation targeting Avrae-style draconic ali
 
 - Mock execution never writes back to Avrae: cvar/uvar/gvar mutations only live for the current run and reset before the next.
 - Network is limited to gvar fetches (when `enableGvarFetch` is true) and `verify_signature`; other Avrae/Discord calls are replaced with mocked context data from `.avraels.json`.
-- `get_gvar`/`using` values are pulled from local var files first; remote fetches go to `https://api.avrae.io/customizations/gvars/<id>` (or your `avraeService.baseUrl`) using `avraeService.token` and are cached for the session.
+- `get_gvar`/`using` values are pulled from local var files first; remote fetches go to `https://api.avrae.io/customizations/gvars/<id>` (or your `avraeService.baseUrl`) using `avraeService.token` and are cached for the session. In var files, a gvar can be a direct value or a `{ "filePath": "relative/or/absolute/path" }` object (also supports `"path"`) that loads file contents as the gvar value.
 - `signature()` returns a mock string (`mock-signature:<int>`). `verify_signature()` POSTs to `/bot/signature/verify`, reuses the last successful response per signature, and includes `avraeService.token` if present.
 
 ## Troubleshooting gvar fetch / verify_signature
 
-- `get_gvar` returns `None` or `using(...)` raises `ModuleNotFoundError`: ensure the workspace `.avraels.json` sets `enableGvarFetch: true`, includes a valid `avraeService.token`, or seed the gvar in a var file referenced by `varFiles`.
+- `get_gvar` returns `None` or `using(...)` raises `ModuleNotFoundError`: ensure the workspace `.avraels.json` sets `enableGvarFetch: true`, includes a valid `avraeService.token`, or seed the gvar in a var file referenced by `varFiles` (including `filePath` gvar entries).
 - HTTP 401/403/404 from fetch/verify calls: check the token (401/403) and the gvar/signature id (404). Override `avraeService.baseUrl` if you mirror the API.
 - Slow or flaky calls: disable remote fetches by flipping `enableGvarFetch` off to rely purely on local vars.
 

{avrae_ls-0.7.1.dist-info → avrae_ls-0.8.1.dist-info}/RECORD

@@ -10,7 +10,7 @@ avrae_ls/code_actions.py,sha256=MLZ5euETh2G4lRO33QkHnIwWPt-XlXMCqy-BlRXz0pk,9562
 avrae_ls/codes.py,sha256=iPRPQ6i9DZheae4_ra1y29vCw3Y4SEu6Udf5WiZj_RY,136
 avrae_ls/completions.py,sha256=YJNK85MkFRJAf7IzltdcWnoKv3jMtFEoIsJwt-hnXJM,25062
 avrae_ls/config.py,sha256=PJakf5JF7dbq1NbSFkoobgjKLzazyyMCyfveoqKzoLU,16810
-avrae_ls/context.py,sha256=0IrGNqZH1hJF7o4f8TfJNzpWURtgYB7y_0UvZhWRxeo,13732
+avrae_ls/context.py,sha256=gsSi2ExDVRItzuWoMgRhUf2FqqlkxATFDXgPOF-VcoE,15298
 avrae_ls/cvars.py,sha256=0tcVbUHx_CKJ6aou3kEsKX37LRWAjkUWlqqIuSRFlXk,3197
 avrae_ls/diagnostics.py,sha256=7B5rL_zu3UByPD1GrGFK5cr6dOQYXz2b362x9MZgUEk,26990
 avrae_ls/dice.py,sha256=DY7V7L-EwAXaCgddgVe9xU1s9lVtiw5Zc2reipNgdTk,874
@@ -32,8 +32,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.7.1.dist-info/METADATA,sha256=2opuMIj8XeU1LZTgKhHLNwObrVojcrQ04BaPhlMnX-o,7624
-avrae_ls-0.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-avrae_ls-0.7.1.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
-avrae_ls-0.7.1.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-avrae_ls-0.7.1.dist-info/RECORD,,
+avrae_ls-0.8.1.dist-info/METADATA,sha256=HmuearSQW6CJEYhxN-qz-MSGvDhh_4Q_KhAVwtd7hiw,7980
+avrae_ls-0.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+avrae_ls-0.8.1.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
+avrae_ls-0.8.1.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+avrae_ls-0.8.1.dist-info/RECORD,,