Skip to content

Commit

Permalink
chore: increase timeout from 5 to 10 seconds (DEV-2450) #438
Browse files Browse the repository at this point in the history
  • Loading branch information
jnussbaum committed Jul 14, 2023
1 parent 1cbf927 commit 4f82d2e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/dsp_tools/fast_xmlupload/process_files.py
Expand Up @@ -35,7 +35,7 @@ def _get_export_moving_image_frames_script() -> None:
export_moving_image_frames_script = user_folder / "export-moving-image-frames.sh"
script_text = requests.get(
"https://github.com/dasch-swiss/dsp-api/raw/main/sipi/scripts/export-moving-image-frames.sh",
timeout=5,
timeout=10,
).text
with open(export_moving_image_frames_script, "w", encoding="utf-8") as f:
f.write(script_text)
Expand Down
20 changes: 10 additions & 10 deletions src/dsp_tools/models/connection.py
Expand Up @@ -68,7 +68,7 @@ def login(self, email: str, password: str) -> None:
self._server + "/v2/authentication",
headers={"Content-Type": "application/json; charset=UTF-8"},
data=jsondata,
timeout=5,
timeout=10,
)
check_for_api_error(response)
result = response.json()
Expand Down Expand Up @@ -105,7 +105,7 @@ def logout(self) -> None:
response = requests.delete(
self._server + "/v2/authentication",
headers={"Authorization": "Bearer " + self._token},
timeout=5,
timeout=10,
)
check_for_api_error(response)
self._token = None
Expand Down Expand Up @@ -192,19 +192,19 @@ def get(self, path: str, headers: Optional[dict[str, str]] = None) -> dict[str,
path = "/" + path
if not self._token:
if not headers:
response = requests.get(self._server + path, timeout=5)
response = requests.get(self._server + path, timeout=10)
else:
response = requests.get(self._server + path, headers, timeout=5)
response = requests.get(self._server + path, headers, timeout=10)
else:
if not headers:
response = requests.get(
self._server + path,
headers={"Authorization": "Bearer " + self._token},
timeout=5,
timeout=10,
)
else:
headers["Authorization"] = "Bearer " + self._token
response = requests.get(self._server + path, headers, timeout=5)
response = requests.get(self._server + path, headers, timeout=10)

check_for_api_error(response)
json_response = response.json()
Expand All @@ -225,14 +225,14 @@ def put(self, path: str, jsondata: Optional[str] = None, content_type: str = "ap
response = requests.put(
self._server + path,
headers={"Authorization": "Bearer " + self._token},
timeout=5,
timeout=10,
)
else:
response = requests.put(
self._server + path,
headers={"Content-Type": content_type + "; charset=UTF-8", "Authorization": "Bearer " + self._token},
data=jsondata,
timeout=5,
timeout=10,
)
check_for_api_error(response)
result = response.json()
Expand All @@ -252,14 +252,14 @@ def delete(self, path: str, params: Optional[any] = None):
self._server + path,
headers={"Authorization": "Bearer " + self._token},
params=params,
timeout=5,
timeout=10,
)

else:
response = requests.delete(
self._server + path,
headers={"Authorization": "Bearer " + self._token},
timeout=5,
timeout=10,
)
check_for_api_error(response)
result = response.json()
Expand Down
12 changes: 6 additions & 6 deletions src/dsp_tools/utils/stack_handling.py
Expand Up @@ -120,7 +120,7 @@ def _get_sipi_docker_config_lua(self) -> None:
Raises:
UserError: if max_file_size is set but cannot be injected into sipi.docker-config.lua
"""
docker_config_lua_text = requests.get(f"{self.__url_prefix}sipi/config/sipi.docker-config.lua", timeout=5).text
docker_config_lua_text = requests.get(f"{self.__url_prefix}sipi/config/sipi.docker-config.lua", timeout=10).text
if self.__stack_configuration.max_file_size:
max_post_size_regex = r"max_post_size ?= ?[\'\"]\d+M[\'\"]"
if not re.search(max_post_size_regex, docker_config_lua_text):
Expand Down Expand Up @@ -158,7 +158,7 @@ def _wait_for_fuseki(self) -> None:
"""
for _ in range(6 * 60):
try:
response = requests.get(url="http://0.0.0.0:3030/$/server", auth=("admin", "test"), timeout=5)
response = requests.get(url="http://0.0.0.0:3030/$/server", auth=("admin", "test"), timeout=10)
if response.ok:
break
except Exception: # pylint: disable=broad-exception-caught
Expand All @@ -175,14 +175,14 @@ def _create_knora_test_repo(self) -> None:
"""
repo_template = requests.get(
f"{self.__url_prefix}webapi/scripts/fuseki-repository-config.ttl.template",
timeout=5,
timeout=10,
).text
repo_template = repo_template.replace("@REPOSITORY@", "knora-test")
response = requests.post(
url="http://0.0.0.0:3030/$/datasets",
files={"file": ("file.ttl", repo_template, "text/turtle; charset=utf8")},
auth=("admin", "test"),
timeout=5,
timeout=10,
)
if not response.ok:
msg = (
Expand Down Expand Up @@ -214,12 +214,12 @@ def _load_data_into_repo(self) -> None:
("test_data/all_data/anything-data.ttl", "http://www.knora.org/data/0001/anything"),
]
for ttl_file, graph in ttl_files:
ttl_text = requests.get(self.__url_prefix + ttl_file, timeout=5).text
ttl_text = requests.get(self.__url_prefix + ttl_file, timeout=10).text
response = requests.post(
url=graph_prefix + graph,
files={"file": ("file.ttl", ttl_text, "text/turtle; charset: utf-8")},
auth=("admin", "test"),
timeout=5,
timeout=10,
)
if not response.ok:
logger.error(f"Cannot start DSP-API: Error when creating graph '{graph}'. response = {response}")
Expand Down

0 comments on commit 4f82d2e

Please sign in to comment.