Matsemoll/pr ci

.github/workflows/pr.yml

@@ -0,0 +1,51 @@
+name: Test PR
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:14.3-alpine
+        env:
+          POSTGRES_DB: postgres
+          POSTGRES_PORT: 5432
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - '127.0.0.1:5432:5432'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - uses: actions/cache@v3
+        id: cache-venv
+        with:
+          path: |
+            ~/.local
+            .venv
+          key: ${{ hashFiles('**/poetry.lock') }}-${{ steps.setup-python.outputs.python-version }}-1
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: false
+          version: 1.5.0
+      - run: |
+          python -m venv .venv --upgrade-deps
+          source .venv/bin/activate
+          poetry install --no-interaction --all-extras
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+
+      - name: Run tests
+        env:
+          PSQL_DATABASE_TEST: postgresql://postgres:postgres@localhost:5432/postgres
+        run: |
+          source .venv/bin/activate
+          pytest

.github/workflows/publish.yml

@@ -6,17 +6,41 @@ on:
       - main
 
 jobs:
-  # build-and-publish-test:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: snok/.github/workflows/publish@main
-  #       with:
-  #         overwrite-repository: true
-  #         repository-url: https://test.pypi.org/legacy/
-  #         token: ${{ secrets.TEST_PYPI_TOKEN }}
-  #         python-version: '3.10.0'
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - uses: actions/cache@v3
+        id: cache-venv
+        with:
+          path: |
+            ~/.local
+            .venv
+          key: ${{ hashFiles('**/poetry.lock') }}-${{ steps.setup-python.outputs.python-version }}-1
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: false
+          version: 1.5.0
+      - run: |
+          python -m venv .venv --upgrade-deps
+          source .venv/bin/activate
+          poetry install --no-interaction --all-extras
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+
+
+      - name: Run tests
+        run: |
+          source .venv/bin/activate
+          pytest
+
   build-and-publish:
-    # needs: build-and-publish-test
+    needs: [test]
     runs-on: ubuntu-latest
     steps:
       - uses: MatsMoll/.github/workflows/publish@patch-1

.gitignore

@@ -2,6 +2,8 @@
 .pg/*
 .DS_STORE
 
+test_data/feature-store.json
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.pre-commit-config.yaml

@@ -1,17 +1,13 @@
+default_stages: [commit]
 repos:
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
       - id: black
         args: [ "--quiet" ]
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.4.0
     hooks:
       - id: check-ast
       - id: check-merge-conflict
@@ -25,43 +21,35 @@ repos:
       - id: trailing-whitespace
       - id: double-quote-string-fixer
 
-  - repo: https://github.com/asottile/yesqa
-    rev: v1.3.0
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.7.0
     hooks:
-      - id: yesqa
-        additional_dependencies: &flake8_deps
-          - flake8-bugbear
+      - id: pyupgrade
+        types: [ python ]
+        args: [ "--py36-plus", "--py37-plus", "--py38-plus", "--py39-plus", "--py310-plus"]
+        files: 'cloud\/.*\.py'
+
+  # Static type and code checkers below
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        additional_dependencies:
           - flake8-comprehensions
           - flake8-print
           - flake8-mutable
-          - flake8-simplify
           - flake8-pytest-style
           - flake8-printf-formatting
-          - 'flake8-simplify==0.18'
-          - 'flake8-type-checking==1.3.2'
+          - 'flake8-simplify==0.19.2'
+          - 'flake8-type-checking==2.1.3'
+        args: [ '--enable-extensions=G' ]
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/python-poetry/poetry
+    rev: 1.5.0
     hooks:
-      - id: flake8
-        additional_dependencies: *flake8_deps
-
-  - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.14.2
-    hooks:
-      - id: check-github-actions
-      - id: check-github-workflows
-
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
-    hooks:
-      - id: pyupgrade
-        args: [ "--py36-plus", "--py37-plus", '--py38-plus', '--py39-plus']
+      - id: poetry-check
 
-  - repo: https://github.com/hadialqattan/pycln
-    rev: v1.2.5
-    hooks:
-      - id: pycln
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.942

.python-version

@@ -0,0 +1 @@
+3.10.5

aligned/__init__.py

@@ -10,7 +10,7 @@
     String,
     Timestamp,
 )
-from aligned.compiler.model import Model
+from aligned.compiler.model import ModelContract
 from aligned.data_source.stream_data_source import HttpStreamSource
 from aligned.feature_store import FeatureStore
 from aligned.feature_view import (
@@ -56,6 +56,6 @@
     'EventTimestamp',
     'Timestamp',
     'Json',
-    'Model',
+    'ModelContract',
     'TextVectoriserModel',
 ]

aligned/cli.py

@@ -246,14 +246,7 @@ def serve_command(
     default='.env',
     help='The path to env variables',
 )
-@click.option(
-    '--prune-unused-features',
-    default=False,
-    help='Will only process features that are used in a model if set to True',
-)
-async def serve_worker_command(
-    repo_path: str, worker_path: str, env_file: str, prune_unused_features: bool
-) -> None:
+async def serve_worker_command(repo_path: str, worker_path: str, env_file: str) -> None:
     """
     Starts a API serving the feature store
     """
@@ -269,7 +262,7 @@ async def serve_worker_command(
 
     worker = StreamWorker.from_object(dir, reference_file_path, obj)
 
-    await worker.start(prune_unused_features)
+    await worker.start()
 
 
 @cli.command('materialize')