Skip to content

Commit 9ae37bb

Browse files
committed
refactoring
1 parent aaa2beb commit 9ae37bb

File tree

4 files changed

+56
-1
lines changed

4 files changed

+56
-1
lines changed

packages/models-library/src/models_library/api_schemas_datcore_adapter/__init__.py

Whitespace-only changes.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
from datetime import datetime
2+
from enum import Enum, unique
3+
from pathlib import Path
4+
5+
from pydantic import BaseModel, ByteSize
6+
7+
8+
class DatasetMetaData(BaseModel):
9+
id: str
10+
display_name: str
11+
12+
13+
@unique
14+
class DataType(str, Enum):
15+
FILE = "FILE"
16+
FOLDER = "FOLDER"
17+
18+
19+
class PackageMetaData(BaseModel):
20+
path: Path
21+
display_path: Path
22+
package_id: str
23+
name: str
24+
filename: str
25+
s3_bucket: str
26+
size: ByteSize
27+
created_at: datetime
28+
updated_at: datetime
29+
30+
31+
class FileMetaData(BaseModel):
32+
dataset_id: str
33+
package_id: str
34+
id: str
35+
name: str
36+
type: str
37+
path: Path
38+
size: int
39+
created_at: datetime
40+
last_modified_at: datetime
41+
data_type: DataType

packages/pytest-simcore/src/pytest_simcore/helpers/httpx_assert_checks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def assert_status(
3232
response.status_code == expected_status_code
3333
), f"received {response.status_code}: {response.text}, expected {get_code_display_name(expected_status_code)}"
3434

35-
# reponse
35+
# response
3636
if expected_status_code == status.HTTP_204_NO_CONTENT:
3737
assert response.text == ""
3838
return None, None

packages/service-library/src/servicelib/fastapi/http_error.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,17 @@ def set_app_default_http_error_handlers(app: FastAPI) -> None:
9999
envelope_error=True,
100100
),
101101
)
102+
103+
# SEE https://docs.python.org/3/library/exceptions.html#exception-hierarchy
104+
app.add_exception_handler(
105+
NotImplementedError,
106+
make_http_error_handler_for_exception(
107+
status.HTTP_501_NOT_IMPLEMENTED, NotImplementedError, envelope_error=True
108+
),
109+
)
110+
app.add_exception_handler(
111+
Exception,
112+
make_http_error_handler_for_exception(
113+
status.HTTP_500_INTERNAL_SERVER_ERROR, Exception, envelope_error=True
114+
),
115+
)

0 commit comments

Comments
 (0)