Hua changes

ExpediaGroup · Jun 26, 2024 · dfdc511 · dfdc511
1 parent 6319ab3
commit dfdc511
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/go.mod b/go.mod
@@ -55,6 +55,8 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gonuts/commander v0.1.0 // indirect
+	github.com/gonuts/flag v0.1.0 // indirect
 	github.com/google/flatbuffers v2.0.8+incompatible // indirect
 	github.com/klauspost/asmfmt v1.3.2 // indirect
 	github.com/klauspost/compress v1.16.3 // indirect

diff --git a/go.sum b/go.sum
@@ -173,6 +173,10 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gonuts/commander v0.1.0 h1:EcDTiVw9oAVORFjQOEOuHQqcl6OXMyTgELocTq6zJ0I=
+github.com/gonuts/commander v0.1.0/go.mod h1:qkb5mSlcWodYgo7vs8ulLnXhfinhZsZcm6+H/z1JjgY=
+github.com/gonuts/flag v0.1.0 h1:fqMv/MZ+oNGu0i9gp0/IQ/ZaPIDoAZBOBaJoV7viCWM=
+github.com/gonuts/flag v0.1.0/go.mod h1:ZTmTGtrSPejTo/SRNhCqwLTmiAgyBdCkLYhHrAoBdz4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/flatbuffers v2.0.5+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=

diff --git a/sdk/python/feast/infra/registry/sql.py b/sdk/python/feast/infra/registry/sql.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import concurrent.futures
 import logging
 import threading
@@ -1066,12 +1068,12 @@ def create_project_if_not_exists(self, project):
 
     def search(
         self,
-        online,
         name="",
         application="",
         owning_team="",
         created_at=datetime.min,
         updated_at=datetime.min,
+        online=False,
     ) -> List[Union[FeatureView, ProjectMetadataModel]]:
         """
         Search for feature views or projects based on the provided search
@@ -1080,61 +1082,46 @@ def search(
         """
         fv_list = []
         with self.engine.connect() as conn:
+            stmt = select(feature_views)
             if name:
-                stmt = select(feature_views).where(
-                    feature_views.c.feature_view_name == name
-                )
-            else:
-                stmt = select(feature_views)
+                stmt = stmt.where(feature_views.c.feature_view_name == name)
 
             rows = conn.execute(stmt).all()
-            print('Before if rows')
-            print(rows)
+
             if rows:
                 fv_list = [
                     FeatureView.from_proto(
                         FeatureViewProto.FromString(row["feature_view_proto"])
                     )
                     for row in rows
                 ]
-                print('after converting from proto')
-                print(fv_list)
 
                 fv_list = [
                     view
                     for view in fv_list
                     if view.created_timestamp is None
                     or view.created_timestamp >= created_at
                 ]
-                print('1')
-                print(fv_list)
+
                 fv_list = [
                     view
                     for view in fv_list
                     if view.last_updated_timestamp is None
                     or view.last_updated_timestamp >= updated_at
                 ]
-                print('2')
-                print(fv_list)
 
                 if owning_team:
                     fv_list = [
                         view for view in fv_list if view.tags.get("team") == owning_team
                     ]
-                print('3')
-                print(fv_list)
                 if application:
                     fv_list = [
                         view
                         for view in fv_list
                         if view.tags.get("application") == application
                     ]
-                print('4')
-                print(fv_list)
-                if online:
+                if online is not None:
                     fv_list = [view for view in fv_list if view.online == online]
-                print('5')
-                print(fv_list)
 
         project_list = self.get_all_project_metadata()
 

diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt
@@ -216,7 +216,7 @@ executing==1.2.0
     # via stack-data
 fastapi==0.95.2
     # via feast (setup.py)
-fastavro==1.7.4
+fastavro==1.8.2
     # via
     #   feast (setup.py)
     #   pandavro
@@ -529,7 +529,7 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.1
     # via feast (setup.py)
-mysqlclient==2.1.1
+mysqlclient==2.2.4
     # via feast (setup.py)
 nbclassic==1.0.0
     # via notebook
@@ -732,7 +732,7 @@ pyjwt[crypto]==2.7.0
     #   snowflake-connector-python
 pymilvus==2.2.14
     # via eg-feast (setup.py)
-pymssql==2.2.7
+pymssql==2.2.8
     # via feast (setup.py)
 pymysql==1.0.3
     # via feast (setup.py)
@@ -798,7 +798,7 @@ pytz==2023.3
     #   pandas
     #   snowflake-connector-python
     #   trino
-pyyaml==6.0
+pyyaml==6.0.1
     # via
     #   dask
     #   feast (setup.py)