test: run code generator and wrapper before tests

Author: uwzm

frost_sta_client/cli.py

@@ -7,7 +7,7 @@
 def main(argv: Optional[list] = None) -> int:
     parser = argparse.ArgumentParser(prog="frost-codegen", description="FROST-STA OData code generator")
     parser.add_argument("--url", "-u", required=True, help="OData endpoint of FROST-Server (e.g., http://host:8080/FROST-Server/ODATA_4.01)")
-    parser.add_argument("--output-dir", "-o", default="frost_sta_client/generated/odata", help="Output directory for generated code")
+    parser.add_argument("--output-dir", "-o", "--out", dest="output_dir", default="frost_sta_client/generated/odata", help="Output directory for generated code")
     parser.add_argument("--module", "-m", default="datamodel", help="Module name for the generated file (default: datamodel)")
     parser.add_argument("--username", help="Basic auth username", default=None)
     parser.add_argument("--password", help="Basic auth password", default=None)

tests/conftest.py

@@ -7,6 +7,35 @@
 from frost_sta_client.service.sensorthingsservice import SensorThingsService
 from frost_sta_client.service.auth_handler import AuthHandler
 
+# Run code generation and install model wrappers before any tests start
+def pytest_sessionstart(session):
+    # 1) Generate OData datamodel (falls back to metadata.xml if endpoint unavailable)
+    try:
+        from frost_sta_client.odata_codegen.generator import generate_from_url
+        url = os.environ.get('FROST_STA_CLIENT_CODEGEN_URL', 'http://localhost:8080/FROST-Server')
+        username = os.environ.get('FROST_STA_CLIENT_CODEGEN_USER')
+        password = os.environ.get('FROST_STA_CLIENT_CODEGEN_PASS')
+        auth = (username, (password or '')) if username is not None else None
+        generate_from_url(url, 'frost_sta_client/generated/odata', 'datamodel', auth=auth)
+    except Exception:
+        # Non-fatal: generator handles fallback internally
+        pass
+
+    # 2) Generate model wrappers under frost_sta_client/model so imports like frost_sta_client.model.thing work
+    try:
+        from frost_sta_client.odata_codegen.install_model import ENTITY_FILE_MAP, ensure_dir as _ensure_dir, write_wrapper as _write_wrapper, write_model_init as _write_model_init
+        model_dir = os.path.join('frost_sta_client', 'model')
+        _ensure_dir(model_dir)
+        from frost_sta_client.model.ext.entity_type import EntityTypes
+        entities = [k for k in EntityTypes.keys() if ENTITY_FILE_MAP.get(k)]
+        for singular in entities:
+            relations = EntityTypes[singular].get('relations_list', [])
+            _write_wrapper(model_dir, singular, relations)
+        _write_model_init(model_dir, entities)
+    except Exception:
+        # Non-fatal: other unit tests can still proceed
+        pass
+
 @pytest.fixture(scope='session')
 def frost_server():
     if os.environ.get('FROST_STA_CLIENT_RUN_INTEGRATION') != '1':