zovos/vk_hackathon
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix date_range filter: use DatetimeRange for RFC3339 strings; set TEAM_ID=35230 in Makefiles, add release target

Browse source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
q 2026-04-18 16:26:14 +03:00
parent 6a25927813
commit 7e40bb6e17
3 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
index/Makefile
View file

@ -1,24 +1,26 @@
LOGIN ?= LOGIN ?=
PASSWORD ?= PASSWORD ?=
TEAM_ID ?= TEAM_ID ?= 35230
DOCKER_REGISTRY_URL ?= 83.166.249.64:5000 DOCKER_REGISTRY_URL ?= 83.166.249.64:5000
PORT ?= 8000 PORT ?= 8000
IMAGE = $(DOCKER_REGISTRY_URL)/$(TEAM_ID)/index-service:latest IMAGE = $(DOCKER_REGISTRY_URL)/$(TEAM_ID)/index-service:latest
.PHONY: login build run push .PHONY: login build run push release
login: login:
@: $(if $(LOGIN),,$(error LOGIN is required for make login)) @: $(if $(LOGIN),,$(error LOGIN is required))
@: $(if $(PASSWORD),,$(error PASSWORD is required for make login)) @: $(if $(PASSWORD),,$(error PASSWORD is required))
docker login $(DOCKER_REGISTRY_URL) -u $(LOGIN) -p $(PASSWORD) docker login $(DOCKER_REGISTRY_URL) -u $(LOGIN) -p $(PASSWORD)
build: build:
@: $(if $(TEAM_ID),,$(error TEAM_ID is required for make build))
docker build --platform linux/amd64 -t $(IMAGE) ./ docker build --platform linux/amd64 -t $(IMAGE) ./
run: build run: build
docker run --rm -p $(PORT):8000 $(IMAGE) docker run --rm -p $(PORT):8000 $(IMAGE)
push: login build push:
docker push $(IMAGE) docker push $(IMAGE)
release: build push
@echo "index-service pushed → $(IMAGE)"

24
search/Makefile
View file

@ -1,14 +1,14 @@
LOGIN ?= LOGIN ?=
PASSWORD ?= PASSWORD ?=
TEAM_ID ?= TEAM_ID ?= 35230
DOCKER_REGISTRY_URL ?= 83.166.249.64:5000 DOCKER_REGISTRY_URL ?= 83.166.249.64:5000
PORT ?= 8000 PORT ?= 8000
QDRANT_URL ?= QDRANT_URL ?=
QDRANT_COLLECTION_NAME ?= evaluation QDRANT_COLLECTION_NAME ?= evaluation
EMBEDDINGS_DENSE_URL ?= EMBEDDINGS_DENSE_URL ?=
EMBEDDINGS_DENSE_MODEL ?= Qwen/Qwen3-Embedding-0.6B EMBEDDINGS_DENSE_MODEL ?= Qwen/Qwen3-Embedding-0.6B
API_KEY ?= dev-api-key API_KEY ?= dev-api-key
RERANKER_URL ?= RERANKER_URL ?=
QDRANT_DENSE_VECTOR_NAME ?= dense QDRANT_DENSE_VECTOR_NAME ?= dense
QDRANT_SPARSE_VECTOR_NAME ?= sparse QDRANT_SPARSE_VECTOR_NAME ?= sparse
@ -16,15 +16,14 @@ REQUIRED_RUN_VARS := QDRANT_URL EMBEDDINGS_DENSE_URL API_KEY RERANKER_URL
IMAGE = $(DOCKER_REGISTRY_URL)/$(TEAM_ID)/search-service:latest IMAGE = $(DOCKER_REGISTRY_URL)/$(TEAM_ID)/search-service:latest
.PHONY: login build run push check-run-env .PHONY: login build run push release
login: login:
@: $(if $(LOGIN),,$(error LOGIN is required for make login)) @: $(if $(LOGIN),,$(error LOGIN is required))
@: $(if $(PASSWORD),,$(error PASSWORD is required for make login)) @: $(if $(PASSWORD),,$(error PASSWORD is required))
docker login $(DOCKER_REGISTRY_URL) -u $(LOGIN) -p $(PASSWORD) docker login $(DOCKER_REGISTRY_URL) -u $(LOGIN) -p $(PASSWORD)
build: build:
@: $(if $(TEAM_ID),,$(error TEAM_ID is required for make build))
docker build --platform linux/amd64 -t $(IMAGE) ./ docker build --platform linux/amd64 -t $(IMAGE) ./
run: build run: build
@ -41,5 +40,8 @@ run: build
-e QDRANT_SPARSE_VECTOR_NAME=$(QDRANT_SPARSE_VECTOR_NAME) \ -e QDRANT_SPARSE_VECTOR_NAME=$(QDRANT_SPARSE_VECTOR_NAME) \
$(IMAGE) $(IMAGE)
push: login build push:
docker push $(IMAGE) docker push $(IMAGE)
release: build push
@echo "search-service pushed → $(IMAGE)"

14
search/retrieval.py
View file

@ -1,4 +1,3 @@
from datetime import datetime
from typing import Any from typing import Any
from qdrant_client import AsyncQdrantClient, models from qdrant_client import AsyncQdrantClient, models
@ -15,13 +14,6 @@ from config import (
from schemas import Question, SparseVector from schemas import Question, SparseVector
def _iso_to_unix(s: str) -> float:
try:
return datetime.fromisoformat(s.replace("Z", "+00:00")).timestamp()
except (ValueError, AttributeError):
return 0.0
def _build_filter(question: Question) -> models.Filter | None: def _build_filter(question: Question) -> models.Filter | None:
must_conditions: list[models.Condition] = [] must_conditions: list[models.Condition] = []
@ -29,9 +21,9 @@ def _build_filter(question: Question) -> models.Filter | None:
must_conditions.append( must_conditions.append(
models.FieldCondition( models.FieldCondition(
key="metadata.start", key="metadata.start",
range=models.Range( datetime_range=models.DatetimeRange(
gte=_iso_to_unix(question.date_range.from_), gte=question.date_range.from_,
lte=_iso_to_unix(question.date_range.to), lte=question.date_range.to,
), ),
) )
) )