Update app.py
Browse files
app.py
CHANGED
|
@@ -15,13 +15,13 @@ co_rerank = cohere.ClientV2(os.environ.get("COHERE_API_KEY"))
|
|
| 15 |
|
| 16 |
vectored = None
|
| 17 |
|
| 18 |
-
|
| 19 |
|
| 20 |
-
|
| 21 |
-
|
| 22 |
|
| 23 |
# デコード関数
|
| 24 |
-
|
| 25 |
for item in data:
|
| 26 |
try:
|
| 27 |
# latin1 でデコードし、utf-8に変換
|
|
@@ -29,7 +29,7 @@ vectored = None
|
|
| 29 |
except UnicodeDecodeError as e:
|
| 30 |
print(f"エラー: {e}")
|
| 31 |
item['text'] = "[デコード失敗]"
|
| 32 |
-
return data
|
| 33 |
|
| 34 |
|
| 35 |
|
|
@@ -152,8 +152,8 @@ vectorstore = Vectorstore(raw_documents)
|
|
| 152 |
# Gradioの関数
|
| 153 |
def search(query):
|
| 154 |
results = vectorstore.retrieve(query)
|
| 155 |
-
|
| 156 |
-
|
| 157 |
return "\n\n".join([f"**Title**: {r['title']}\n**Text**: {r['text']}\n**URL**: {r['url']}" for r in decoded_data])
|
| 158 |
|
| 159 |
# Gradioインターフェース
|
|
|
|
| 15 |
|
| 16 |
vectored = None
|
| 17 |
|
| 18 |
+
dataid = requests.get("https://www.ryhintl.com/dbjson/getjson?sqlcmd=select * from company_matters")
|
| 19 |
|
| 20 |
+
data_str = dataid.content.decode('utf-8')
|
| 21 |
+
data = json.loads(data_str)
|
| 22 |
|
| 23 |
# デコード関数
|
| 24 |
+
def decode_text(data):
|
| 25 |
for item in data:
|
| 26 |
try:
|
| 27 |
# latin1 でデコードし、utf-8に変換
|
|
|
|
| 29 |
except UnicodeDecodeError as e:
|
| 30 |
print(f"エラー: {e}")
|
| 31 |
item['text'] = "[デコード失敗]"
|
| 32 |
+
return data
|
| 33 |
|
| 34 |
|
| 35 |
|
|
|
|
| 152 |
# Gradioの関数
|
| 153 |
def search(query):
|
| 154 |
results = vectorstore.retrieve(query)
|
| 155 |
+
decoded_data = decode_text(results)
|
| 156 |
+
print("decoded_data:",decoded_data)
|
| 157 |
return "\n\n".join([f"**Title**: {r['title']}\n**Text**: {r['text']}\n**URL**: {r['url']}" for r in decoded_data])
|
| 158 |
|
| 159 |
# Gradioインターフェース
|