Spaces:
Running
Running
JJ Tsao
commited on
Commit
·
1080531
1
Parent(s):
4435dd1
Update media_type enum
Browse files- app/api/schemas.py +2 -2
- app/retrieval/media_retriever.py +5 -5
- app/services/chatbot.py +1 -1
- app/services/usage_logger.py +0 -2
app/api/schemas.py
CHANGED
@@ -10,8 +10,8 @@ class ChatMessage(BaseModel):
|
|
10 |
|
11 |
|
12 |
class MediaType(str, Enum):
|
13 |
-
MOVIE = "
|
14 |
-
TV = "
|
15 |
|
16 |
class DeviceInfo(BaseModel):
|
17 |
device_type: Optional[str] = None
|
|
|
10 |
|
11 |
|
12 |
class MediaType(str, Enum):
|
13 |
+
MOVIE = "movie"
|
14 |
+
TV = "tv"
|
15 |
|
16 |
class DeviceInfo(BaseModel):
|
17 |
device_type: Optional[str] = None
|
app/retrieval/media_retriever.py
CHANGED
@@ -65,12 +65,12 @@ class MediaRetriever:
|
|
65 |
def embed_sparse(self, query: str, media_type: str) -> Dict:
|
66 |
bm25_model = (
|
67 |
self.bm25_models["movie"]
|
68 |
-
if media_type.lower() == "
|
69 |
else self.bm25_models["tv"]
|
70 |
)
|
71 |
bm25_vocab = (
|
72 |
self.bm25_vocabs["movie"]
|
73 |
-
if media_type.lower() == "
|
74 |
else self.bm25_vocabs["tv"]
|
75 |
)
|
76 |
|
@@ -99,7 +99,7 @@ class MediaRetriever:
|
|
99 |
self,
|
100 |
dense_vector: List[float],
|
101 |
sparse_vector: Dict,
|
102 |
-
media_type: str = "
|
103 |
genres=None,
|
104 |
providers=None,
|
105 |
year_range=None,
|
@@ -171,7 +171,7 @@ class MediaRetriever:
|
|
171 |
def _query_dense(self, vector, media_type, qdrant_filter):
|
172 |
collection = (
|
173 |
self.movie_collection_name
|
174 |
-
if media_type == "
|
175 |
else self.tv_collection_name
|
176 |
)
|
177 |
return self.client.query_points(
|
@@ -187,7 +187,7 @@ class MediaRetriever:
|
|
187 |
def _query_sparse(self, vector, media_type, qdrant_filter):
|
188 |
collection = (
|
189 |
self.movie_collection_name
|
190 |
-
if media_type == "
|
191 |
else self.tv_collection_name
|
192 |
)
|
193 |
return self.client.query_points(
|
|
|
65 |
def embed_sparse(self, query: str, media_type: str) -> Dict:
|
66 |
bm25_model = (
|
67 |
self.bm25_models["movie"]
|
68 |
+
if media_type.lower() == "movie"
|
69 |
else self.bm25_models["tv"]
|
70 |
)
|
71 |
bm25_vocab = (
|
72 |
self.bm25_vocabs["movie"]
|
73 |
+
if media_type.lower() == "movie"
|
74 |
else self.bm25_vocabs["tv"]
|
75 |
)
|
76 |
|
|
|
99 |
self,
|
100 |
dense_vector: List[float],
|
101 |
sparse_vector: Dict,
|
102 |
+
media_type: str = "movie",
|
103 |
genres=None,
|
104 |
providers=None,
|
105 |
year_range=None,
|
|
|
171 |
def _query_dense(self, vector, media_type, qdrant_filter):
|
172 |
collection = (
|
173 |
self.movie_collection_name
|
174 |
+
if media_type == "movie"
|
175 |
else self.tv_collection_name
|
176 |
)
|
177 |
return self.client.query_points(
|
|
|
187 |
def _query_sparse(self, vector, media_type, qdrant_filter):
|
188 |
collection = (
|
189 |
self.movie_collection_name
|
190 |
+
if media_type == "movie"
|
191 |
else self.tv_collection_name
|
192 |
)
|
193 |
return self.client.query_points(
|
app/services/chatbot.py
CHANGED
@@ -13,7 +13,7 @@ def build_chat_fn(retriever, intent_classifier):
|
|
13 |
def chat(
|
14 |
question,
|
15 |
history,
|
16 |
-
media_type="
|
17 |
genres=None,
|
18 |
providers=None,
|
19 |
year_range=None,
|
|
|
13 |
def chat(
|
14 |
question,
|
15 |
history,
|
16 |
+
media_type="movie",
|
17 |
genres=None,
|
18 |
providers=None,
|
19 |
year_range=None,
|
app/services/usage_logger.py
CHANGED
@@ -25,7 +25,6 @@ def log_query_and_results(
|
|
25 |
}
|
26 |
|
27 |
try:
|
28 |
-
# 1. Insert usage log
|
29 |
query_resp = httpx.post(
|
30 |
f"{SUPABASE_URL}/rest/v1/query_logs",
|
31 |
headers=headers,
|
@@ -35,7 +34,6 @@ def log_query_and_results(
|
|
35 |
if query_resp.status_code not in (200, 201, 204):
|
36 |
print("⚠️ Failed to log usage:", query_resp.text)
|
37 |
|
38 |
-
# 2. Insert result logs in batch
|
39 |
if result_entries:
|
40 |
result_resp = httpx.post(
|
41 |
f"{SUPABASE_URL}/rest/v1/result_logs",
|
|
|
25 |
}
|
26 |
|
27 |
try:
|
|
|
28 |
query_resp = httpx.post(
|
29 |
f"{SUPABASE_URL}/rest/v1/query_logs",
|
30 |
headers=headers,
|
|
|
34 |
if query_resp.status_code not in (200, 201, 204):
|
35 |
print("⚠️ Failed to log usage:", query_resp.text)
|
36 |
|
|
|
37 |
if result_entries:
|
38 |
result_resp = httpx.post(
|
39 |
f"{SUPABASE_URL}/rest/v1/result_logs",
|