From 5b1eef057e9d9ccf825ff1834453636a2764899e Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Tue, 27 Sep 2022 13:30:35 +0200
Subject: [PATCH] Fix import status
---
funkwhale_api_client/models/__init__.py | 3 +--
...oad_import_status_enum.py => import_status_enum.py} | 2 +-
funkwhale_api_client/models/manage_upload.py | 10 +++++-----
funkwhale_api_client/models/manage_upload_request.py | 10 +++++-----
.../models/patched_upload_for_owner_request.py | 10 +++++-----
funkwhale_api_client/models/upload_for_owner.py | 10 +++++-----
.../models/upload_for_owner_import_status_enum.py | 9 ---------
.../models/upload_for_owner_request.py | 10 +++++-----
8 files changed, 27 insertions(+), 37 deletions(-)
rename funkwhale_api_client/models/{manage_upload_import_status_enum.py => import_status_enum.py} (81%)
delete mode 100644 funkwhale_api_client/models/upload_for_owner_import_status_enum.py
diff --git a/funkwhale_api_client/models/__init__.py b/funkwhale_api_client/models/__init__.py
index 84f69d9..50a944d 100644
--- a/funkwhale_api_client/models/__init__.py
+++ b/funkwhale_api_client/models/__init__.py
@@ -59,6 +59,7 @@ from .full_actor import FullActor
from .global_preference import GlobalPreference
from .global_preference_request import GlobalPreferenceRequest
from .ident import Ident
+from .import_status_enum import ImportStatusEnum
from .inbox_item import InboxItem
from .inbox_item_request import InboxItemRequest
from .inbox_item_type_enum import InboxItemTypeEnum
@@ -137,7 +138,6 @@ from .manage_track_request import ManageTrackRequest
from .manage_upload import ManageUpload
from .manage_upload_import_details import ManageUploadImportDetails
from .manage_upload_import_metadata import ManageUploadImportMetadata
-from .manage_upload_import_status_enum import ManageUploadImportStatusEnum
from .manage_upload_metadata import ManageUploadMetadata
from .manage_upload_request import ManageUploadRequest
from .manage_upload_request_import_details import ManageUploadRequestImportDetails
@@ -263,7 +263,6 @@ from .tracks_list_ordering_item import TracksListOrderingItem
from .upload_for_owner import UploadForOwner
from .upload_for_owner_import_details import UploadForOwnerImportDetails
from .upload_for_owner_import_metadata import UploadForOwnerImportMetadata
-from .upload_for_owner_import_status_enum import UploadForOwnerImportStatusEnum
from .upload_for_owner_metadata import UploadForOwnerMetadata
from .upload_for_owner_request import UploadForOwnerRequest
from .upload_for_owner_request_import_metadata import UploadForOwnerRequestImportMetadata
diff --git a/funkwhale_api_client/models/manage_upload_import_status_enum.py b/funkwhale_api_client/models/import_status_enum.py
similarity index 81%
rename from funkwhale_api_client/models/manage_upload_import_status_enum.py
rename to funkwhale_api_client/models/import_status_enum.py
index fbee8a7..a017ed4 100644
--- a/funkwhale_api_client/models/manage_upload_import_status_enum.py
+++ b/funkwhale_api_client/models/import_status_enum.py
@@ -1,7 +1,7 @@
from enum import Enum
-class ManageUploadImportStatusEnum(str, Enum):
+class ImportStatusEnum(str, Enum):
DRAFT = "draft"
PENDING = "pending"
FINISHED = "finished"
diff --git a/funkwhale_api_client/models/manage_upload.py b/funkwhale_api_client/models/manage_upload.py
index 6d3ebe8..ffb859b 100644
--- a/funkwhale_api_client/models/manage_upload.py
+++ b/funkwhale_api_client/models/manage_upload.py
@@ -4,11 +4,11 @@ from typing import Any, Dict, List, Type, TypeVar, Union
import attr
from dateutil.parser import isoparse
+from ..models.import_status_enum import ImportStatusEnum
from ..models.manage_nested_library import ManageNestedLibrary
from ..models.manage_nested_track import ManageNestedTrack
from ..models.manage_upload_import_details import ManageUploadImportDetails
from ..models.manage_upload_import_metadata import ManageUploadImportMetadata
-from ..models.manage_upload_import_status_enum import ManageUploadImportStatusEnum
from ..models.manage_upload_metadata import ManageUploadMetadata
from ..types import UNSET, Unset
@@ -40,7 +40,7 @@ class ManageUpload:
metadata (Union[Unset, ManageUploadMetadata]):
import_date (Union[Unset, None, datetime.datetime]):
import_details (Union[Unset, ManageUploadImportDetails]):
- import_status (Union[Unset, ManageUploadImportStatusEnum]):
+ import_status (Union[Unset, ImportStatusEnum]):
import_metadata (Union[Unset, ManageUploadImportMetadata]):
import_reference (Union[Unset, str]):
"""
@@ -66,7 +66,7 @@ class ManageUpload:
metadata: Union[Unset, ManageUploadMetadata] = UNSET
import_date: Union[Unset, None, datetime.datetime] = UNSET
import_details: Union[Unset, ManageUploadImportDetails] = UNSET
- import_status: Union[Unset, ManageUploadImportStatusEnum] = UNSET
+ import_status: Union[Unset, ImportStatusEnum] = UNSET
import_metadata: Union[Unset, ManageUploadImportMetadata] = UNSET
import_reference: Union[Unset, str] = UNSET
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
@@ -254,11 +254,11 @@ class ManageUpload:
import_details = ManageUploadImportDetails.from_dict(_import_details)
_import_status = d.pop("import_status", UNSET)
- import_status: Union[Unset, ManageUploadImportStatusEnum]
+ import_status: Union[Unset, ImportStatusEnum]
if isinstance(_import_status, Unset):
import_status = UNSET
else:
- import_status = ManageUploadImportStatusEnum(_import_status)
+ import_status = ImportStatusEnum(_import_status)
_import_metadata = d.pop("import_metadata", UNSET)
import_metadata: Union[Unset, ManageUploadImportMetadata]
diff --git a/funkwhale_api_client/models/manage_upload_request.py b/funkwhale_api_client/models/manage_upload_request.py
index 58c3f2a..b80a5d7 100644
--- a/funkwhale_api_client/models/manage_upload_request.py
+++ b/funkwhale_api_client/models/manage_upload_request.py
@@ -6,9 +6,9 @@ from typing import Any, Dict, List, Tuple, Type, TypeVar, Union
import attr
from dateutil.parser import isoparse
+from ..models.import_status_enum import ImportStatusEnum
from ..models.manage_nested_library_request import ManageNestedLibraryRequest
from ..models.manage_nested_track_request import ManageNestedTrackRequest
-from ..models.manage_upload_import_status_enum import ManageUploadImportStatusEnum
from ..models.manage_upload_request_import_details import ManageUploadRequestImportDetails
from ..models.manage_upload_request_import_metadata import ManageUploadRequestImportMetadata
from ..models.manage_upload_request_metadata import ManageUploadRequestMetadata
@@ -38,7 +38,7 @@ class ManageUploadRequest:
metadata (Union[Unset, ManageUploadRequestMetadata]):
import_date (Union[Unset, None, datetime.datetime]):
import_details (Union[Unset, ManageUploadRequestImportDetails]):
- import_status (Union[Unset, ManageUploadImportStatusEnum]):
+ import_status (Union[Unset, ImportStatusEnum]):
import_metadata (Union[Unset, ManageUploadRequestImportMetadata]):
import_reference (Union[Unset, str]):
"""
@@ -60,7 +60,7 @@ class ManageUploadRequest:
metadata: Union[Unset, ManageUploadRequestMetadata] = UNSET
import_date: Union[Unset, None, datetime.datetime] = UNSET
import_details: Union[Unset, ManageUploadRequestImportDetails] = UNSET
- import_status: Union[Unset, ManageUploadImportStatusEnum] = UNSET
+ import_status: Union[Unset, ImportStatusEnum] = UNSET
import_metadata: Union[Unset, ManageUploadRequestImportMetadata] = UNSET
import_reference: Union[Unset, str] = UNSET
additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
@@ -337,11 +337,11 @@ class ManageUploadRequest:
import_details = ManageUploadRequestImportDetails.from_dict(_import_details)
_import_status = d.pop("import_status", UNSET)
- import_status: Union[Unset, ManageUploadImportStatusEnum]
+ import_status: Union[Unset, ImportStatusEnum]
if isinstance(_import_status, Unset):
import_status = UNSET
else:
- import_status = ManageUploadImportStatusEnum(_import_status)
+ import_status = ImportStatusEnum(_import_status)
_import_metadata = d.pop("import_metadata", UNSET)
import_metadata: Union[Unset, ManageUploadRequestImportMetadata]
diff --git a/funkwhale_api_client/models/patched_upload_for_owner_request.py b/funkwhale_api_client/models/patched_upload_for_owner_request.py
index 59f9796..40d1a4b 100644
--- a/funkwhale_api_client/models/patched_upload_for_owner_request.py
+++ b/funkwhale_api_client/models/patched_upload_for_owner_request.py
@@ -4,9 +4,9 @@ from typing import Any, Dict, List, Tuple, Type, TypeVar, Union
import attr
+from ..models.import_status_enum import ImportStatusEnum
from ..models.patched_upload_for_owner_request_import_metadata import PatchedUploadForOwnerRequestImportMetadata
from ..models.track_request import TrackRequest
-from ..models.upload_for_owner_import_status_enum import UploadForOwnerImportStatusEnum
from ..types import UNSET, File, FileJsonType, Unset
T = TypeVar("T", bound="PatchedUploadForOwnerRequest")
@@ -19,7 +19,7 @@ class PatchedUploadForOwnerRequest:
track (Union[Unset, None, TrackRequest]):
library (Union[Unset, str]):
channel (Union[Unset, str]):
- import_status (Union[Unset, UploadForOwnerImportStatusEnum]): Default: UploadForOwnerImportStatusEnum.PENDING.
+ import_status (Union[Unset, ImportStatusEnum]): Default: ImportStatusEnum.PENDING.
import_metadata (Union[Unset, PatchedUploadForOwnerRequestImportMetadata]):
import_reference (Union[Unset, str]):
source (Union[Unset, None, str]):
@@ -29,7 +29,7 @@ class PatchedUploadForOwnerRequest:
track: Union[Unset, None, TrackRequest] = UNSET
library: Union[Unset, str] = UNSET
channel: Union[Unset, str] = UNSET
- import_status: Union[Unset, UploadForOwnerImportStatusEnum] = UploadForOwnerImportStatusEnum.PENDING
+ import_status: Union[Unset, ImportStatusEnum] = ImportStatusEnum.PENDING
import_metadata: Union[Unset, PatchedUploadForOwnerRequestImportMetadata] = UNSET
import_reference: Union[Unset, str] = UNSET
source: Union[Unset, None, str] = UNSET
@@ -145,11 +145,11 @@ class PatchedUploadForOwnerRequest:
channel = d.pop("channel", UNSET)
_import_status = d.pop("import_status", UNSET)
- import_status: Union[Unset, UploadForOwnerImportStatusEnum]
+ import_status: Union[Unset, ImportStatusEnum]
if isinstance(_import_status, Unset):
import_status = UNSET
else:
- import_status = UploadForOwnerImportStatusEnum(_import_status)
+ import_status = ImportStatusEnum(_import_status)
_import_metadata = d.pop("import_metadata", UNSET)
import_metadata: Union[Unset, PatchedUploadForOwnerRequestImportMetadata]
diff --git a/funkwhale_api_client/models/upload_for_owner.py b/funkwhale_api_client/models/upload_for_owner.py
index f38d5d6..98c4705 100644
--- a/funkwhale_api_client/models/upload_for_owner.py
+++ b/funkwhale_api_client/models/upload_for_owner.py
@@ -4,10 +4,10 @@ from typing import Any, Dict, List, Optional, Type, TypeVar, Union
import attr
from dateutil.parser import isoparse
+from ..models.import_status_enum import ImportStatusEnum
from ..models.track import Track
from ..models.upload_for_owner_import_details import UploadForOwnerImportDetails
from ..models.upload_for_owner_import_metadata import UploadForOwnerImportMetadata
-from ..models.upload_for_owner_import_status_enum import UploadForOwnerImportStatusEnum
from ..models.upload_for_owner_metadata import UploadForOwnerMetadata
from ..types import UNSET, Unset
@@ -31,7 +31,7 @@ class UploadForOwner:
bitrate (Optional[int]):
size (Optional[int]):
import_date (Optional[datetime.datetime]):
- import_status (Union[Unset, UploadForOwnerImportStatusEnum]): Default: UploadForOwnerImportStatusEnum.PENDING.
+ import_status (Union[Unset, ImportStatusEnum]): Default: ImportStatusEnum.PENDING.
import_metadata (Union[Unset, UploadForOwnerImportMetadata]):
import_reference (Union[Unset, str]):
source (Union[Unset, None, str]):
@@ -50,7 +50,7 @@ class UploadForOwner:
track: Union[Unset, None, Track] = UNSET
library: Union[Unset, str] = UNSET
channel: Union[Unset, str] = UNSET
- import_status: Union[Unset, UploadForOwnerImportStatusEnum] = UploadForOwnerImportStatusEnum.PENDING
+ import_status: Union[Unset, ImportStatusEnum] = ImportStatusEnum.PENDING
import_metadata: Union[Unset, UploadForOwnerImportMetadata] = UNSET
import_reference: Union[Unset, str] = UNSET
source: Union[Unset, None, str] = UNSET
@@ -163,11 +163,11 @@ class UploadForOwner:
import_date = isoparse(_import_date)
_import_status = d.pop("import_status", UNSET)
- import_status: Union[Unset, UploadForOwnerImportStatusEnum]
+ import_status: Union[Unset, ImportStatusEnum]
if isinstance(_import_status, Unset):
import_status = UNSET
else:
- import_status = UploadForOwnerImportStatusEnum(_import_status)
+ import_status = ImportStatusEnum(_import_status)
_import_metadata = d.pop("import_metadata", UNSET)
import_metadata: Union[Unset, UploadForOwnerImportMetadata]
diff --git a/funkwhale_api_client/models/upload_for_owner_import_status_enum.py b/funkwhale_api_client/models/upload_for_owner_import_status_enum.py
deleted file mode 100644
index 573fb77..0000000
--- a/funkwhale_api_client/models/upload_for_owner_import_status_enum.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from enum import Enum
-
-
-class UploadForOwnerImportStatusEnum(str, Enum):
- DRAFT = "draft"
- PENDING = "pending"
-
- def __str__(self) -> str:
- return str(self.value)
diff --git a/funkwhale_api_client/models/upload_for_owner_request.py b/funkwhale_api_client/models/upload_for_owner_request.py
index b3e7a53..881d694 100644
--- a/funkwhale_api_client/models/upload_for_owner_request.py
+++ b/funkwhale_api_client/models/upload_for_owner_request.py
@@ -4,8 +4,8 @@ from typing import Any, Dict, List, Tuple, Type, TypeVar, Union
import attr
+from ..models.import_status_enum import ImportStatusEnum
from ..models.track_request import TrackRequest
-from ..models.upload_for_owner_import_status_enum import UploadForOwnerImportStatusEnum
from ..models.upload_for_owner_request_import_metadata import UploadForOwnerRequestImportMetadata
from ..types import UNSET, File, Unset
@@ -20,7 +20,7 @@ class UploadForOwnerRequest:
track (Union[Unset, None, TrackRequest]):
library (Union[Unset, str]):
channel (Union[Unset, str]):
- import_status (Union[Unset, UploadForOwnerImportStatusEnum]): Default: UploadForOwnerImportStatusEnum.PENDING.
+ import_status (Union[Unset, ImportStatusEnum]): Default: ImportStatusEnum.PENDING.
import_metadata (Union[Unset, UploadForOwnerRequestImportMetadata]):
import_reference (Union[Unset, str]):
source (Union[Unset, None, str]):
@@ -30,7 +30,7 @@ class UploadForOwnerRequest:
track: Union[Unset, None, TrackRequest] = UNSET
library: Union[Unset, str] = UNSET
channel: Union[Unset, str] = UNSET
- import_status: Union[Unset, UploadForOwnerImportStatusEnum] = UploadForOwnerImportStatusEnum.PENDING
+ import_status: Union[Unset, ImportStatusEnum] = ImportStatusEnum.PENDING
import_metadata: Union[Unset, UploadForOwnerRequestImportMetadata] = UNSET
import_reference: Union[Unset, str] = UNSET
source: Union[Unset, None, str] = UNSET
@@ -149,11 +149,11 @@ class UploadForOwnerRequest:
channel = d.pop("channel", UNSET)
_import_status = d.pop("import_status", UNSET)
- import_status: Union[Unset, UploadForOwnerImportStatusEnum]
+ import_status: Union[Unset, ImportStatusEnum]
if isinstance(_import_status, Unset):
import_status = UNSET
else:
- import_status = UploadForOwnerImportStatusEnum(_import_status)
+ import_status = ImportStatusEnum(_import_status)
_import_metadata = d.pop("import_metadata", UNSET)
import_metadata: Union[Unset, UploadForOwnerRequestImportMetadata]
--
GitLab