Skip to content

Commit 338f787

Browse files
Masterain98Masterain98
committed
Update dependencies
1 parent c670008 commit 338f787

File tree

4 files changed

+56
-48
lines changed

4 files changed

+56
-48
lines changed

‎Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
FROM python:3.12 AS builder
44
WORKDIR /code
55
ADD . /code
6-
RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
6+
RUN pip install "fastapi[standard]"
7+
RUN pip install redis
8+
RUN pip install sqlalchemy
9+
RUN pip install pymysql
10+
RUN pip install pyinstaller
711
RUN pyinstaller -F main.py
812

913
# Runtime

‎Dockerfile-alpine

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ FROM python:3.11-alpine3.18 AS builder
44
WORKDIR /code
55
ADD . /code
66
RUN apk add --no-cache gcc g++ musl-dev rust cargo patchelf
7-
RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
7+
RUN pip install "fastapi[standard]"
8+
RUN pip install redis
9+
RUN pip install sqlalchemy
10+
RUN pip install pymysql
11+
RUN pip install pyinstaller
812
RUN pyinstaller -F main.py
913

1014
# Runtime

‎fetcher.py

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import requests
1+
import httpx
22
import json
33
import os
44
from base_logger import logger
@@ -10,21 +10,21 @@ def fetch_genshin_impact_update():
1010
weapon_config_file = "WeaponExcelConfigData.json"
1111
resp = {}
1212

13-
avatar_excel_config_data = json.loads(requests.get(target_host + avatar_config_file).text)
14-
weapon_excel_config_data = json.loads(requests.get(target_host + weapon_config_file).text)
15-
chs_dict = json.loads(requests.get(target_host + "TextMap/TextMapCHS.json").text)
16-
cht_dict = json.loads(requests.get(target_host + "TextMap/TextMapCHT.json").text)
17-
de_dict = json.loads(requests.get(target_host + "TextMap/TextMapDE.json").text)
18-
en_dict = json.loads(requests.get(target_host + "TextMap/TextMapEN.json").text)
19-
es_dict = json.loads(requests.get(target_host + "TextMap/TextMapES.json").text)
20-
fr_dict = json.loads(requests.get(target_host + "TextMap/TextMapFR.json").text)
21-
id_dict = json.loads(requests.get(target_host + "TextMap/TextMapID.json").text)
22-
jp_dict = json.loads(requests.get(target_host + "TextMap/TextMapJP.json").text)
23-
kr_dict = json.loads(requests.get(target_host + "TextMap/TextMapKR.json").text)
24-
pt_dict = json.loads(requests.get(target_host + "TextMap/TextMapPT.json").text)
25-
ru_dict = json.loads(requests.get(target_host + "TextMap/TextMapRU.json").text)
26-
th_dict = json.loads(requests.get(target_host + "TextMap/TextMapTH.json").text)
27-
vi_dict = json.loads(requests.get(target_host + "TextMap/TextMapVI.json").text)
13+
avatar_excel_config_data = json.loads(httpx.get(target_host + avatar_config_file).text)
14+
weapon_excel_config_data = json.loads(httpx.get(target_host + weapon_config_file).text)
15+
chs_dict = json.loads(httpx.get(target_host + "TextMap/TextMapCHS.json").text)
16+
cht_dict = json.loads(httpx.get(target_host + "TextMap/TextMapCHT.json").text)
17+
de_dict = json.loads(httpx.get(target_host + "TextMap/TextMapDE.json").text)
18+
en_dict = json.loads(httpx.get(target_host + "TextMap/TextMapEN.json").text)
19+
es_dict = json.loads(httpx.get(target_host + "TextMap/TextMapES.json").text)
20+
fr_dict = json.loads(httpx.get(target_host + "TextMap/TextMapFR.json").text)
21+
id_dict = json.loads(httpx.get(target_host + "TextMap/TextMapID.json").text)
22+
jp_dict = json.loads(httpx.get(target_host + "TextMap/TextMapJP.json").text)
23+
kr_dict = json.loads(httpx.get(target_host + "TextMap/TextMapKR.json").text)
24+
pt_dict = json.loads(httpx.get(target_host + "TextMap/TextMapPT.json").text)
25+
ru_dict = json.loads(httpx.get(target_host + "TextMap/TextMapRU.json").text)
26+
th_dict = json.loads(httpx.get(target_host + "TextMap/TextMapTH.json").text)
27+
vi_dict = json.loads(httpx.get(target_host + "TextMap/TextMapVI.json").text)
2828
dict_list = [chs_dict, cht_dict, de_dict, en_dict, es_dict, fr_dict, id_dict,
2929
jp_dict, kr_dict, pt_dict, ru_dict, th_dict, vi_dict]
3030
item_list = avatar_excel_config_data + weapon_excel_config_data
@@ -68,21 +68,21 @@ def fetch_starrail_update():
6868
weapon_config_file = "ExcelOutput/EquipmentConfig.json"
6969
resp = {}
7070

71-
avatar_config_data = json.loads(requests.get(target_host + avatar_config_file).text)
72-
weapon_config_data = json.loads(requests.get(target_host + weapon_config_file).text)
73-
chs_dict = json.loads(requests.get(target_host + "TextMap/TextMapCHS.json").text)
74-
cht_dict = json.loads(requests.get(target_host + "TextMap/TextMapCHT.json").text)
75-
de_dict = json.loads(requests.get(target_host + "TextMap/TextMapDE.json").text)
76-
en_dict = json.loads(requests.get(target_host + "TextMap/TextMapEN.json").text)
77-
es_dict = json.loads(requests.get(target_host + "TextMap/TextMapES.json").text)
78-
fr_dict = json.loads(requests.get(target_host + "TextMap/TextMapFR.json").text)
79-
id_dict = json.loads(requests.get(target_host + "TextMap/TextMapID.json").text)
80-
jp_dict = json.loads(requests.get(target_host + "TextMap/TextMapJP.json").text)
81-
kr_dict = json.loads(requests.get(target_host + "TextMap/TextMapKR.json").text)
82-
pt_dict = json.loads(requests.get(target_host + "TextMap/TextMapPT.json").text)
83-
ru_dict = json.loads(requests.get(target_host + "TextMap/TextMapRU.json").text)
84-
th_dict = json.loads(requests.get(target_host + "TextMap/TextMapTH.json").text)
85-
vi_dict = json.loads(requests.get(target_host + "TextMap/TextMapVI.json").text)
71+
avatar_config_data = json.loads(httpx.get(target_host + avatar_config_file).text)
72+
weapon_config_data = json.loads(httpx.get(target_host + weapon_config_file).text)
73+
chs_dict = json.loads(httpx.get(target_host + "TextMap/TextMapCHS.json").text)
74+
cht_dict = json.loads(httpx.get(target_host + "TextMap/TextMapCHT.json").text)
75+
de_dict = json.loads(httpx.get(target_host + "TextMap/TextMapDE.json").text)
76+
en_dict = json.loads(httpx.get(target_host + "TextMap/TextMapEN.json").text)
77+
es_dict = json.loads(httpx.get(target_host + "TextMap/TextMapES.json").text)
78+
fr_dict = json.loads(httpx.get(target_host + "TextMap/TextMapFR.json").text)
79+
id_dict = json.loads(httpx.get(target_host + "TextMap/TextMapID.json").text)
80+
jp_dict = json.loads(httpx.get(target_host + "TextMap/TextMapJP.json").text)
81+
kr_dict = json.loads(httpx.get(target_host + "TextMap/TextMapKR.json").text)
82+
pt_dict = json.loads(httpx.get(target_host + "TextMap/TextMapPT.json").text)
83+
ru_dict = json.loads(httpx.get(target_host + "TextMap/TextMapRU.json").text)
84+
th_dict = json.loads(httpx.get(target_host + "TextMap/TextMapTH.json").text)
85+
vi_dict = json.loads(httpx.get(target_host + "TextMap/TextMapVI.json").text)
8686
dict_list = [chs_dict, cht_dict, de_dict, en_dict, es_dict, fr_dict, id_dict,
8787
jp_dict, kr_dict, pt_dict, ru_dict, th_dict, vi_dict]
8888
item_list = avatar_config_data + weapon_config_data
@@ -135,7 +135,7 @@ def fetch_zzz_update():
135135
name_hash_id = ""
136136
item_id = ""
137137

138-
avatar_config_data = json.loads(requests.get(target_host + avatar_config_file).text)
138+
avatar_config_data = json.loads(httpx.get(target_host + avatar_config_file).text)
139139
key_name = list(avatar_config_data.keys())
140140
if len(key_name) == 1:
141141
avatar_config_data = avatar_config_data[key_name[0]]
@@ -149,24 +149,24 @@ def fetch_zzz_update():
149149
else:
150150
logger.info(f"Successfully fetched name_hash_id: {name_hash_id} and item_id: {item_id} from zzz")
151151

152-
weapon_config_data = json.loads(requests.get(target_host + weapon_config_file).text)
152+
weapon_config_data = json.loads(httpx.get(target_host + weapon_config_file).text)
153153
key_name = list(weapon_config_data.keys())
154154
if len(key_name) == 1:
155155
weapon_config_data = weapon_config_data[key_name[0]]
156156
logger.info(f"Successfully fetched {len(avatar_config_data) + len(weapon_config_data)} items from zzz")
157-
chs_dict = json.loads(requests.get(target_host + "TextMap/TextMapTemplateTb.json").text)
158-
cht_dict = json.loads(requests.get(target_host + "TextMap/TextMap_CHTTemplateTb.json").text)
159-
de_dict = json.loads(requests.get(target_host + "TextMap/TextMap_DETemplateTb.json").text)
160-
en_dict = json.loads(requests.get(target_host + "TextMap/TextMap_ENTemplateTb.json").text)
161-
es_dict = json.loads(requests.get(target_host + "TextMap/TextMap_ESTemplateTb.json").text)
162-
fr_dict = json.loads(requests.get(target_host + "TextMap/TextMap_FRTemplateTb.json").text)
163-
id_dict = json.loads(requests.get(target_host + "TextMap/TextMap_IDTemplateTb.json").text)
164-
jp_dict = json.loads(requests.get(target_host + "TextMap/TextMap_JATemplateTb.json").text)
165-
kr_dict = json.loads(requests.get(target_host + "TextMap/TextMap_KOTemplateTb.json").text)
166-
pt_dict = json.loads(requests.get(target_host + "TextMap/TextMap_PTTemplateTb.json").text)
167-
ru_dict = json.loads(requests.get(target_host + "TextMap/TextMap_RUTemplateTb.json").text)
168-
th_dict = json.loads(requests.get(target_host + "TextMap/TextMap_THTemplateTb.json").text)
169-
vi_dict = json.loads(requests.get(target_host + "TextMap/TextMap_VITemplateTb.json").text)
157+
chs_dict = json.loads(httpx.get(target_host + "TextMap/TextMapTemplateTb.json").text)
158+
cht_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_CHTTemplateTb.json").text)
159+
de_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_DETemplateTb.json").text)
160+
en_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_ENTemplateTb.json").text)
161+
es_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_ESTemplateTb.json").text)
162+
fr_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_FRTemplateTb.json").text)
163+
id_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_IDTemplateTb.json").text)
164+
jp_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_JATemplateTb.json").text)
165+
kr_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_KOTemplateTb.json").text)
166+
pt_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_PTTemplateTb.json").text)
167+
ru_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_RUTemplateTb.json").text)
168+
th_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_THTemplateTb.json").text)
169+
vi_dict = json.loads(httpx.get(target_host + "TextMap/TextMap_VITemplateTb.json").text)
170170
dict_list = [chs_dict, cht_dict, de_dict, en_dict, es_dict, fr_dict, id_dict,
171171
jp_dict, kr_dict, pt_dict, ru_dict, th_dict, vi_dict]
172172
item_list = avatar_config_data + weapon_config_data

‎requirements.txt

-318 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)