Skip to content

Commit f21193c

Browse files
authored
Merge branch 'feast-dev:master' into master
2 parents 7ea572d + a8aeb79 commit f21193c

File tree

6 files changed

+39
-9
lines changed

6 files changed

+39
-9
lines changed

infra/charts/feast-feature-server/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: feast-feature-server
33
description: Feast Feature Server in Go or Python
44
type: application
5-
version: 0.42.0
5+
version: 0.42.1
66
keywords:
77
- machine learning
88
- big data

infra/charts/feast-feature-server/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ See [here](https://github.com/feast-dev/feast/tree/master/examples/python-helm-d
6060
| service.port | int | `80` | |
6161
| service.type | string | `"ClusterIP"` | |
6262
| serviceAccount.name | string | `""` | |
63-
| tolerations | list | `[]` | |
63+
| tolerations | list | `[]` | |
64+
| route.enabled | bool | `false` | |
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- if and (.Values.route.enabled) (eq .Values.feast_mode "ui") }}
2+
---
3+
kind: Route
4+
apiVersion: route.openshift.io/v1
5+
metadata:
6+
name: {{ include "feast-feature-server.fullname" . }}
7+
labels:
8+
{{- include "feast-feature-server.labels" . | nindent 4 }}
9+
spec:
10+
to:
11+
kind: Service
12+
name: {{ include "feast-feature-server.fullname" . }}
13+
port:
14+
targetPort: http
15+
tls:
16+
termination: edge
17+
insecureEdgeTerminationPolicy: Redirect
18+
{{- end}}

infra/charts/feast-feature-server/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ livenessProbe:
7474
readinessProbe:
7575
initialDelaySeconds: 20
7676
periodSeconds: 10
77+
78+
# to create OpenShift Route object for UI
79+
route:
80+
enabled: false

sdk/python/feast/infra/online_stores/milvus_online_store/milvus.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,16 @@ class MilvusOnlineStore(OnlineStore):
108108

109109
def _connect(self, config: RepoConfig) -> MilvusClient:
110110
if not self.client:
111-
self.client = MilvusClient(
112-
url=f"{config.online_store.host}:{config.online_store.port}",
113-
token=f"{config.online_store.username}:{config.online_store.password}"
114-
if config.online_store.username and config.online_store.password
115-
else "",
116-
)
111+
if config.provider == "local":
112+
print("Connecting to Milvus in local mode using ./milvus_demo.db")
113+
self.client = MilvusClient("./milvus_demo.db")
114+
else:
115+
self.client = MilvusClient(
116+
url=f"{config.online_store.host}:{config.online_store.port}",
117+
token=f"{config.online_store.username}:{config.online_store.password}"
118+
if config.online_store.username and config.online_store.password
119+
else "",
120+
)
117121
return self.client
118122

119123
def _get_collection(self, config: RepoConfig, table: FeatureView) -> Dict[str, Any]:
@@ -247,7 +251,8 @@ def online_write_batch(
247251
progress(1)
248252

249253
self.client.insert(
250-
collection_name=collection["collection_name"], data=entity_batch_to_insert
254+
collection_name=collection["collection_name"],
255+
data=entity_batch_to_insert,
251256
)
252257

253258
def online_read(

sdk/python/feast/type_map.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ def spark_to_feast_value_type(spark_type_as_str: str) -> ValueType:
815815
"float": ValueType.FLOAT,
816816
"boolean": ValueType.BOOL,
817817
"timestamp": ValueType.UNIX_TIMESTAMP,
818+
"date": ValueType.UNIX_TIMESTAMP,
818819
"array<byte>": ValueType.BYTES_LIST,
819820
"array<string>": ValueType.STRING_LIST,
820821
"array<int>": ValueType.INT32_LIST,
@@ -824,6 +825,7 @@ def spark_to_feast_value_type(spark_type_as_str: str) -> ValueType:
824825
"array<float>": ValueType.FLOAT_LIST,
825826
"array<boolean>": ValueType.BOOL_LIST,
826827
"array<timestamp>": ValueType.UNIX_TIMESTAMP_LIST,
828+
"array<date>": ValueType.UNIX_TIMESTAMP_LIST,
827829
}
828830
if spark_type_as_str.startswith("decimal"):
829831
spark_type_as_str = "decimal"

0 commit comments

Comments
 (0)