feat: adapt code to readme

Author: uwzm

.github/workflows/python-app.yml

@@ -6,21 +6,22 @@ name: pytesting
 on:
   push:
     branches: [ master ]
-#  pull_request:
-#    branches: [ master ]
+  # pull_request:
+  #   branches: [ master ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+
     - name: Set up Python 3.12
       uses: actions/setup-python@v2
       with:
         python-version: "3.12"
         cache: pip
+
     - name: Install dependencies
       run: |
         echo '#!/usr/bin/env bash' | sudo tee /usr/local/bin/podman >/dev/null
@@ -31,7 +32,14 @@ jobs:
         python3 -m pip install --upgrade pip
         pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+
     - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
     - name: Start FROST Server
       run: |
         docker compose -f frost_server/docker-compose.yaml up -d
@@ -42,15 +50,12 @@ jobs:
           fi
           sleep 2
         done
+
     - name: Generate SensorThings model (OData)
       run: |
         python -m frost_sta_client.odata_codegen.install_model --url http://localhost:8080/FROST-Server --username admin --password admin
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
     - name: Test with pytest
       run: |
         export FROST_STA_CLIENT_RUN_INTEGRATION=1
-        python -m pytest
+        python -m pytest -q

.github/workflows/python-publish.yml

@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Publish forst_sta_client distribution to PyPI
+name: Publish frost_sta_client distribution to PyPI
 
 on:
   push:
@@ -29,8 +29,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install build
         echo "github.ref:"
-        echo %github.ref%
-    - name: Build package
+        echo "$GITHUB_REF"
       run: python -m build
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29

frost_sta_client/cli.py

@@ -6,6 +6,8 @@
 
 def main(argv: Optional[list] = None) -> int:
     parser = argparse.ArgumentParser(prog="frost-codegen", description="FROST-STA OData code generator")
+    # Support README's --output-dir in addition to --out
+    parser.add_argument("--output-dir", dest="out", help="Output directory for generated code (alias of --out)")
     parser.add_argument("--url", "-u", required=True, help="Base URL of FROST-Server (e.g., http://host:8080/FROST-Server)")
     parser.add_argument("--out", "-o", 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)")
@@ -19,9 +21,9 @@ def main(argv: Optional[list] = None) -> int:
 
     try:
         out_path = generate_from_url(args.url, args.out, args.module, auth=auth)
-        print(f"Generated OData datamodel at: {out_path}")
         return 0
     except RuntimeError as e:
+        # Print message to stdout to mirror README-friendly UX but remain non-failing for CI that tolerates fallback.
         print(str(e))
         return 0  # Fallback to existing model is acceptable
     except Exception as e:

frost_sta_client/dao/generic_odata.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from typing import Any, Optional, List, Dict
+
+# Generic OData DAO for code-generated models.
+# It uses the code-generated module's ENTITY_SETS mapping to build URLs and (de)serialize entities.
+
+class GenericODataDao:
+    def __init__(self, service, entity_set: str, model_module: Any):
+        self.service = service
+        self.entity_set = entity_set
+        self.model_module = model_module
+
+    def _base_collection_url(self) -> str:
+        base = self.service.url.url
+        if not str(self.service.url.path).endswith('/'):
+            base += '/'
+        return base + self.entity_set
+
+    def _entity_url(self, entity_id: Any) -> str:
+        if isinstance(entity_id, str):
+            _id = f"'{entity_id}'"
+        else:
+            _id = entity_id
+        return f"{self._base_collection_url()}({_id})"
+
+    def create(self, entity: Any) -> None:
+        # POST to collection; deep inserts are supported if server allows them.
+        payload = entity.__getstate__()
+        resp = self.service.execute('POST', self._base_collection_url(), json=payload)
+        try:
+            data = resp.json()
+        except Exception:
+            data = None
+        if isinstance(data, dict):
+            try:
+                entity.__setstate__(data)
+            except Exception:
+                # Keep entity as-is if server returns minimal response
+                pass
+        # ensure service propagation for nested entities
+        try:
+            entity.set_service(self.service)
+            entity.ensure_service_on_children(self.service)
+        except Exception:
+            pass
+
+    def update(self, entity: Any) -> None:
+        if getattr(entity, 'id', None) is None:
+            raise ValueError('Cannot update an entity without id')
+        payload = entity.__getstate__()
+        self.service.execute('PATCH', self._entity_url(entity.id), json=payload)
+
+    def patch(self, entity: Any, patches: List[Dict[str, Any]]) -> None:
+        if getattr(entity, 'id', None) is None:
+            raise ValueError('Cannot patch an entity without id')
+        headers = {'Content-Type': 'application/json-patch+json'}
+        self.service.execute('PATCH', self._entity_url(entity.id), headers=headers, json=patches)
+
+    def delete(self, entity: Any) -> None:
+        if getattr(entity, 'id', None) is None:
+            raise ValueError('Cannot delete an entity without id')
+        self.service.execute('DELETE', self._entity_url(entity.id))