Spaces:
Sleeping
Sleeping
Upload 3 files
Browse files- advanced_rag.py +4 -3
- tools_service.py +24 -6
advanced_rag.py
CHANGED
|
@@ -65,10 +65,11 @@ Alternative queries (one per line):"""
|
|
| 65 |
# Generate expansions
|
| 66 |
response = ""
|
| 67 |
for msg in hf_client.chat_completion(
|
| 68 |
-
messages=[{"role": "user", "content":
|
| 69 |
-
max_tokens=
|
| 70 |
stream=True,
|
| 71 |
-
temperature=0.7
|
|
|
|
| 72 |
):
|
| 73 |
if msg.choices and msg.choices[0].delta.content:
|
| 74 |
response += msg.choices[0].delta.content
|
|
|
|
| 65 |
# Generate expansions
|
| 66 |
response = ""
|
| 67 |
for msg in hf_client.chat_completion(
|
| 68 |
+
messages=[{"role": "user", "content": prompt}],
|
| 69 |
+
max_tokens=256,
|
| 70 |
stream=True,
|
| 71 |
+
temperature=0.7,
|
| 72 |
+
model="openai/gpt-oss-20b"
|
| 73 |
):
|
| 74 |
if msg.choices and msg.choices[0].delta.content:
|
| 75 |
response += msg.choices[0].delta.content
|
tools_service.py
CHANGED
|
@@ -107,7 +107,7 @@ QUAN TRỌNG:
|
|
| 107 |
"""
|
| 108 |
try:
|
| 109 |
response = await self.client.get(
|
| 110 |
-
f"
|
| 111 |
params={"eventCode": event_code}
|
| 112 |
)
|
| 113 |
response.raise_for_status()
|
|
@@ -123,20 +123,38 @@ QUAN TRỌNG:
|
|
| 123 |
"message": f"Không tìm thấy sự kiện với mã {event_code}"
|
| 124 |
}
|
| 125 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 126 |
return {
|
| 127 |
"success": True,
|
| 128 |
-
"event_code":
|
| 129 |
"event_name": event.get("eventName"),
|
|
|
|
| 130 |
"description": event.get("description"),
|
| 131 |
"short_description": event.get("shortDescription"),
|
| 132 |
"start_time": event.get("startTimeEventTime"),
|
| 133 |
"end_time": event.get("endTimeEventTime"),
|
| 134 |
"start_sale": event.get("startTicketSaleTime"),
|
| 135 |
"end_sale": event.get("endTicketSaleTime"),
|
| 136 |
-
"location":
|
| 137 |
-
"address": event.get("location", {}).get("address"),
|
| 138 |
-
"city": event.get("location", {}).get("city"),
|
| 139 |
-
},
|
| 140 |
"contact": {
|
| 141 |
"email": event.get("publicContactEmail"),
|
| 142 |
"phone": event.get("publicContactPhone"),
|
|
|
|
| 107 |
"""
|
| 108 |
try:
|
| 109 |
response = await self.client.get(
|
| 110 |
+
f"https://www.festavenue.site/event/get-event-by-event-code",
|
| 111 |
params={"eventCode": event_code}
|
| 112 |
)
|
| 113 |
response.raise_for_status()
|
|
|
|
| 123 |
"message": f"Không tìm thấy sự kiện với mã {event_code}"
|
| 124 |
}
|
| 125 |
|
| 126 |
+
# Extract location với nested address structure
|
| 127 |
+
location_data = event.get("location", {})
|
| 128 |
+
location = {
|
| 129 |
+
"address": {
|
| 130 |
+
"street": location_data.get("address", {}).get("street", ""),
|
| 131 |
+
"city": location_data.get("address", {}).get("city", ""),
|
| 132 |
+
"state": location_data.get("address", {}).get("state", ""),
|
| 133 |
+
"postalCode": location_data.get("address", {}).get("postalCode", ""),
|
| 134 |
+
"country": location_data.get("address", {}).get("country", "")
|
| 135 |
+
},
|
| 136 |
+
"coordinates": {
|
| 137 |
+
"latitude": location_data.get("coordinates", {}).get("latitude"),
|
| 138 |
+
"longitude": location_data.get("coordinates", {}).get("longitude")
|
| 139 |
+
}
|
| 140 |
+
}
|
| 141 |
+
|
| 142 |
+
# Build event URL
|
| 143 |
+
event_code = event.get("eventCode")
|
| 144 |
+
event_url = f"https://www.festavenue.site/user/event/{event_code}" if event_code else None
|
| 145 |
+
|
| 146 |
return {
|
| 147 |
"success": True,
|
| 148 |
+
"event_code": event_code,
|
| 149 |
"event_name": event.get("eventName"),
|
| 150 |
+
"event_url": event_url, # NEW: Direct link to event page
|
| 151 |
"description": event.get("description"),
|
| 152 |
"short_description": event.get("shortDescription"),
|
| 153 |
"start_time": event.get("startTimeEventTime"),
|
| 154 |
"end_time": event.get("endTimeEventTime"),
|
| 155 |
"start_sale": event.get("startTicketSaleTime"),
|
| 156 |
"end_sale": event.get("endTicketSaleTime"),
|
| 157 |
+
"location": location, # Full nested structure
|
|
|
|
|
|
|
|
|
|
| 158 |
"contact": {
|
| 159 |
"email": event.get("publicContactEmail"),
|
| 160 |
"phone": event.get("publicContactPhone"),
|