Merge branch 'main' into search-local-disk

huggingface · Apr 12, 2024 · a473062 · a473062
2 parents 5493c3d + 2ee9156
commit a473062
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 154 deletions.
diff --git a/chart/env/prod.yaml b/chart/env/prod.yaml
@@ -386,6 +386,7 @@ search:
       alb.ingress.kubernetes.io/group.order: "1"
       alb.ingress.kubernetes.io/target-node-labels: role-datasets-server-search=true
       alb.ingress.kubernetes.io/target-group-attributes: stickiness.enabled=true,stickiness.lb_cookie.duration_seconds=300
+      alb.ingress.kubernetes.io/target-type: ip
   resources:
     requests:
       cpu: 1

diff --git a/front/admin_ui/poetry.lock b/front/admin_ui/poetry.lock
diff --git a/libs/libapi/src/libapi/duckdb.py b/libs/libapi/src/libapi/duckdb.py
@@ -11,7 +11,7 @@
 
 import anyio
 from anyio import Path
-from libcommon.constants import DUCKDB_INDEX_DOWNLOADS_SUBDIRECTORY, DUCKDB_VERSION, SPLIT_DUCKDB_INDEX_KIND
+from libcommon.constants import DUCKDB_INDEX_DOWNLOADS_SUBDIRECTORY, SPLIT_DUCKDB_INDEX_KIND
 from libcommon.parquet_utils import extract_split_name_from_parquet_url
 from libcommon.prometheus import StepProfiler
 from libcommon.simple_cache import CacheEntry
@@ -74,7 +74,7 @@ def get_download_folder(
     payload = (dataset, config, split, revision)
     hash_suffix = sha1(json.dumps(payload, sort_keys=True).encode(), usedforsecurity=False).hexdigest()[:8]
     subdirectory = "".join([c if re.match(r"[\w-]", c) else "-" for c in f"{dataset}-{hash_suffix}"])
-    return f"{root_directory}/{DUCKDB_INDEX_DOWNLOADS_SUBDIRECTORY}/{DUCKDB_VERSION}/{subdirectory}"
+    return f"{root_directory}/{DUCKDB_INDEX_DOWNLOADS_SUBDIRECTORY}/{subdirectory}"
 
 
 def available_disk_space(path: StrPath, required_space: int) -> bool:

diff --git a/libs/libcommon/src/libcommon/constants.py b/libs/libcommon/src/libcommon/constants.py
@@ -9,7 +9,6 @@
 DUCKDB_INDEX_CACHE_APPNAME = "dataset_viewer_duckdb_index"
 DUCKDB_INDEX_DOWNLOADS_SUBDIRECTORY = "downloads"
 DUCKDB_INDEX_JOB_RUNNER_SUBDIRECTORY = "job_runner"
-DUCKDB_VERSION = "0.10.0"
 CACHE_METRICS_COLLECTION = "cacheTotalMetric"
 TYPE_AND_STATUS_JOB_COUNTS_COLLECTION = "jobTotalMetric"
 WORKER_TYPE_JOB_COUNTS_COLLECTION = "workerTypeJobCounts"