chore: Update gitpod.yaml with uv (#4267)

tokoko · web-flow · commit 23b9cfad5077 · 2024-06-13T12:35:40.000-05:00
* update gitpod.yaml with uv and pixi

Signed-off-by: tokoko &lt;tokoko96@gmail.com&gt;

* fix linter issues

Signed-off-by: tokoko &lt;tokoko96@gmail.com&gt;

* change precommit commands

Signed-off-by: tokoko &lt;tokoko96@gmail.com&gt;

---------

Signed-off-by: tokoko &lt;tokoko96@gmail.com&gt;
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -0,0 +1,8 @@
+FROM gitpod/workspace-base
+RUN sudo apt-get update && sudo apt-get install -y python3-dev python3-setuptools python3-pip python-is-python3 && sudo rm -rf /var/lib/apt/lists/*
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+RUN curl -fsSL https://pixi.sh/install.sh | bash
+ENV PATH=$PATH:/home/gitpod/.cargo/bin
+RUN curl -s "https://get.sdkman.io" | bash
+SHELL ["/bin/bash", "-c"]
+RUN source "/home/gitpod/.sdkman/bin/sdkman-init.sh" && sdk install java 14.0.2-zulu
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,42 +1,20 @@
 #  https://www.gitpod.io/docs/config-gitpod-file
+image:
+    file: .gitpod.Dockerfile
+
 tasks:
   - init: |
-      python -m venv venv
-      source venv/bin/activate
-
-      pip install pre-commit
+      uv venv
+      uv pip install pre-commit
       pre-commit install --hook-type pre-commit --hook-type pre-push
-      pip install '.[dev]'
-      make compile-protos-python
-      make compile-protos-go
-      make compile-go-lib
-    env:
-      PYTHONUSERBASE: "/workspace/.pip-modules"
-    command: |
-      source venv/bin/activate
-
-      git config --global alias.ci 'commit -s'
-      git config --global alias.sw switch
-      git config --global alias.st status
-      git config --global alias.co checkout
-      git config --global alias.br branch
-      git config --global alias.df diff
-github:
-  prebuilds:
-    # enable for the default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: false
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: false
-    # add a check to pull requests (defaults to true)
-    addCheck: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
-    addComment: false
-    # add a "Review in Gitpod" button to the pull request's description (defaults to false)
-    addBadge: false
+      source .venv/bin/activate
+      export PYTHON=3.10 && make install-python-ci-dependencies-uv-venv
+    #   git config --global alias.ci 'commit -s'
+    #   git config --global alias.sw switch
+    #   git config --global alias.st status
+    #   git config --global alias.co checkout
+    #   git config --global alias.br branch
+    #   git config --global alias.df diff
 
 vscode:
   extensions:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,13 +7,13 @@ repos:
         name: Format
         stages: [ push ]
         language: system
-        entry: make format
+        entry: make format-python
         pass_filenames: false
       - id: lint
         name: Lint
         stages: [ push ]
         language: system
-        entry: make lint
+        entry: make lint-python
         pass_filenames: false
       - id: template
         name: Build Templates
diff --git a/Makefile b/Makefile
@@ -46,6 +46,11 @@ install-python-ci-dependencies-uv:
 	uv pip install --system --no-deps -e .
 	python setup.py build_python_protos --inplace
 
+install-python-ci-dependencies-uv-venv:
+	uv pip sync sdk/python/requirements/py$(PYTHON)-ci-requirements.txt
+	uv pip install --no-deps -e .
+	python setup.py build_python_protos --inplace
+
 lock-python-ci-dependencies:
 	uv pip compile --system --no-strip-extras setup.py --extra ci --output-file sdk/python/requirements/py$(PYTHON)-ci-requirements.txt
 
diff --git a/sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py
@@ -47,7 +47,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/feast/infra/offline_stores/contrib/mssql_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/mssql_offline_store/tests/data_source.py
@@ -64,7 +64,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/feast/infra/offline_stores/contrib/postgres_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/postgres_offline_store/tests/data_source.py
@@ -91,7 +91,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
@@ -115,7 +114,7 @@ def create_offline_store_config(self) -> PostgreSQLOfflineStoreConfig:
     def get_prefixed_table_name(self, suffix: str) -> str:
         return f"{self.project_name}_{suffix}"
 
-    def create_online_store(self) -> PostgreSQLOnlineStoreConfig:
+    def create_online_store(self) -> PostgreSQLOnlineStoreConfig:  # type: ignore
         assert self.container
         return PostgreSQLOnlineStoreConfig(
             type="postgres",
diff --git a/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/tests/data_source.py
@@ -69,7 +69,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/tests/data_source.py
@@ -81,7 +81,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py
@@ -500,9 +500,7 @@ def construct_test_environment(
         aws_registry_path = os.getenv(
             "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
         )
-        registry: Union[str, RegistryConfig] = (
-            f"{aws_registry_path}/{project}/registry.db"
-        )
+        registry = RegistryConfig(path=f"{aws_registry_path}/{project}/registry.db")
     else:
         registry = RegistryConfig(
             path=str(Path(repo_dir_name) / "registry.db"),
diff --git a/sdk/python/tests/integration/feature_repos/universal/data_source_creator.py b/sdk/python/tests/integration/feature_repos/universal/data_source_creator.py
@@ -18,7 +18,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = None,
@@ -32,7 +31,6 @@ def create_data_source(
             df: The dataframe to be used to create the data source.
             destination_name: This str is used by the implementing classes to
                 isolate the multiple dataframes from each other.
-            event_timestamp_column: (Deprecated) Pass through for the underlying data source.
             created_timestamp_column: Pass through for the underlying data source.
             field_mapping: Pass through for the underlying data source.
             timestamp_field: Pass through for the underlying data source.
diff --git a/sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py b/sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py
@@ -49,7 +49,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/tests/integration/feature_repos/universal/data_sources/snowflake.py b/sdk/python/tests/integration/feature_repos/universal/data_sources/snowflake.py
@@ -47,7 +47,6 @@ def create_data_source(
         self,
         df: pd.DataFrame,
         destination_name: str,
-        event_timestamp_column="ts",
         created_timestamp_column="created_ts",
         field_mapping: Optional[Dict[str, str]] = None,
         timestamp_field: Optional[str] = "ts",
diff --git a/sdk/python/tests/integration/feature_repos/universal/feature_views.py b/sdk/python/tests/integration/feature_repos/universal/feature_views.py
@@ -85,7 +85,8 @@ def conv_rate_plus_100_feature_view(
         schema=[] if infer_features else _features,
         sources=sources,
         feature_transformation=PandasTransformation(
-            udf=conv_rate_plus_100, udf_string="raw udf source"
+            udf=conv_rate_plus_100,
+            udf_string="raw udf source",  # type: ignore
         )
         if not use_substrait_odfv
         else SubstraitTransformation.from_ibis(conv_rate_plus_100_ibis, sources),
@@ -124,10 +125,11 @@ def similarity_feature_view(
 
     return OnDemandFeatureView(
         name=similarity.__name__,
-        sources=sources,
+        sources=sources,  # type: ignore
         schema=[] if infer_features else _fields,
         feature_transformation=PandasTransformation(
-            udf=similarity, udf_string="similarity raw udf"
+            udf=similarity,
+            udf_string="similarity raw udf",  # type: ignore
         ),
     )
 
diff --git a/sdk/python/tests/integration/feature_repos/universal/online_store/elasticsearch.py b/sdk/python/tests/integration/feature_repos/universal/online_store/elasticsearch.py
@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict
 
 from testcontainers.elasticsearch import ElasticSearchContainer
 
@@ -14,7 +14,7 @@ def __init__(self, project_name: str, **kwargs):
             "elasticsearch:8.3.3",
         ).with_exposed_ports(9200)
 
-    def create_online_store(self) -> Dict[str, str]:
+    def create_online_store(self) -> Dict[str, Any]:
         self.container.start()
         return {
             "host": "localhost",
diff --git a/sdk/python/tests/integration/feature_repos/universal/online_store/postgres.py b/sdk/python/tests/integration/feature_repos/universal/online_store/postgres.py
@@ -1,5 +1,5 @@
 import os
-from typing import Dict
+from typing import Any, Dict
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_for_logs
@@ -51,7 +51,7 @@ def __init__(self, project_name: str, **kwargs):
             )
         )
 
-    def create_online_store(self) -> Dict[str, str]:
+    def create_online_store(self) -> Dict[str, Any]:
         self.container.start()
         log_string_to_wait_for = "database system is ready to accept connections"
         wait_for_logs(
diff --git a/sdk/python/tests/integration/feature_repos/universal/online_store_creator.py b/sdk/python/tests/integration/feature_repos/universal/online_store_creator.py
@@ -1,13 +1,14 @@
 from abc import ABC, abstractmethod
+from typing import Any
 
-from feast.repo_config import FeastConfigBaseModel
+# from feast.repo_config import FeastConfigBaseModel
 
 
 class OnlineStoreCreator(ABC):
     def __init__(self, project_name: str, **kwargs):
         self.project_name = project_name
 
-    def create_online_store(self) -> FeastConfigBaseModel:
+    def create_online_store(self) -> dict[str, Any]:
         raise NotImplementedError
 
     @abstractmethod
