feat: UTC-515: Ordering and user expansion in tag list

.fern/metadata.json

@@ -47,5 +47,5 @@
     },
     "pyproject_toml": "[project.scripts]\nlabel-studio-converter = \"label_studio_sdk.converter.main:main\"\n"
   },
-  "sdkVersion": "2.0.17"
+  "sdkVersion": "2.0.18"
 }

pyproject.toml

@@ -4,7 +4,7 @@ dynamic = ["version"]
 
 [tool.poetry]
 name = "label-studio-sdk"
-version = "2.0.18.dev"
+version = "2.0.18"
 description = ""
 readme = "README.md"
 authors = []

reference.md

@@ -11502,7 +11502,7 @@ client.tasks.create_event(
 <dl>
 <dd>
 
-**annotation_draft:** `typing.Optional[int]` — Draft annotation ID associated with this event
+**annotation_draft_id:** `typing.Optional[int]` — Draft annotation ID associated with this event
 
 </dd>
 </dl>
@@ -29192,6 +29192,14 @@ client.organizations.member_tags.list(
 <dl>
 <dd>
 
+**ordering:** `typing.Optional[str]` — Which field to use when ordering the results.
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **page:** `typing.Optional[int]` — A page number within the paginated result set.
 
 </dd>
@@ -29200,6 +29208,14 @@ client.organizations.member_tags.list(
 <dl>
 <dd>
 
+**page_size:** `typing.Optional[int]` — Number of results per page (default: 30, max: 100).
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **search:** `typing.Optional[str]` — Search tags by label (case-insensitive).
 
 </dd>

src/label_studio_sdk/organizations/member_tags/client.py

@@ -39,7 +39,9 @@ def list(
         self,
         id: int,
         *,
+        ordering: typing.Optional[str] = None,
         page: typing.Optional[int] = None,
+        page_size: typing.Optional[int] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> PaginatedOrganizationMemberTagList:
@@ -57,9 +59,15 @@ def list(
         id : int
             A unique integer value identifying this organization.
 
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
         page : typing.Optional[int]
             A page number within the paginated result set.
 
+        page_size : typing.Optional[int]
+            Number of results per page (default: 30, max: 100).
+
         search : typing.Optional[str]
             Search tags by label (case-insensitive).
 
@@ -82,7 +90,9 @@ def list(
             id=1,
         )
         """
-        _response = self._raw_client.list(id, page=page, search=search, request_options=request_options)
+        _response = self._raw_client.list(
+            id, ordering=ordering, page=page, page_size=page_size, search=search, request_options=request_options
+        )
         return _response.data
 
     def create(
@@ -348,7 +358,9 @@ async def list(
         self,
         id: int,
         *,
+        ordering: typing.Optional[str] = None,
         page: typing.Optional[int] = None,
+        page_size: typing.Optional[int] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> PaginatedOrganizationMemberTagList:
@@ -366,9 +378,15 @@ async def list(
         id : int
             A unique integer value identifying this organization.
 
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
         page : typing.Optional[int]
             A page number within the paginated result set.
 
+        page_size : typing.Optional[int]
+            Number of results per page (default: 30, max: 100).
+
         search : typing.Optional[str]
             Search tags by label (case-insensitive).
 
@@ -399,7 +417,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client.list(id, page=page, search=search, request_options=request_options)
+        _response = await self._raw_client.list(
+            id, ordering=ordering, page=page, page_size=page_size, search=search, request_options=request_options
+        )
         return _response.data
 
     async def create(

src/label_studio_sdk/organizations/member_tags/raw_client.py

@@ -30,7 +30,9 @@ def list(
         self,
         id: int,
         *,
+        ordering: typing.Optional[str] = None,
         page: typing.Optional[int] = None,
+        page_size: typing.Optional[int] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[PaginatedOrganizationMemberTagList]:
@@ -48,9 +50,15 @@ def list(
         id : int
             A unique integer value identifying this organization.
 
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
         page : typing.Optional[int]
             A page number within the paginated result set.
 
+        page_size : typing.Optional[int]
+            Number of results per page (default: 30, max: 100).
+
         search : typing.Optional[str]
             Search tags by label (case-insensitive).
 
@@ -66,7 +74,9 @@ def list(
             f"api/organizations/{jsonable_encoder(id)}/member-tags",
             method="GET",
             params={
+                "ordering": ordering,
                 "page": page,
+                "page_size": page_size,
                 "search": search,
             },
             request_options=request_options,
@@ -477,7 +487,9 @@ async def list(
         self,
         id: int,
         *,
+        ordering: typing.Optional[str] = None,
         page: typing.Optional[int] = None,
+        page_size: typing.Optional[int] = None,
         search: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[PaginatedOrganizationMemberTagList]:
@@ -495,9 +507,15 @@ async def list(
         id : int
             A unique integer value identifying this organization.
 
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
         page : typing.Optional[int]
             A page number within the paginated result set.
 
+        page_size : typing.Optional[int]
+            Number of results per page (default: 30, max: 100).
+
         search : typing.Optional[str]
             Search tags by label (case-insensitive).
 
@@ -513,7 +531,9 @@ async def list(
             f"api/organizations/{jsonable_encoder(id)}/member-tags",
             method="GET",
             params={
+                "ordering": ordering,
                 "page": page,
+                "page_size": page_size,
                 "search": search,
             },
             request_options=request_options,

src/label_studio_sdk/tasks/client.py

@@ -529,7 +529,7 @@ def create_event(
         event_key: str,
         event_time: dt.datetime,
         annotation: typing.Optional[int] = OMIT,
-        annotation_draft: typing.Optional[int] = OMIT,
+        annotation_draft_id: typing.Optional[int] = OMIT,
         meta: typing.Optional[typing.Any] = OMIT,
         review: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -599,7 +599,7 @@ def create_event(
         annotation : typing.Optional[int]
             Annotation ID associated with this event
 
-        annotation_draft : typing.Optional[int]
+        annotation_draft_id : typing.Optional[int]
             Draft annotation ID associated with this event
 
         meta : typing.Optional[typing.Any]
@@ -638,7 +638,7 @@ def create_event(
             event_key=event_key,
             event_time=event_time,
             annotation=annotation,
-            annotation_draft=annotation_draft,
+            annotation_draft_id=annotation_draft_id,
             meta=meta,
             review=review,
             request_options=request_options,
@@ -1217,7 +1217,7 @@ async def create_event(
         event_key: str,
         event_time: dt.datetime,
         annotation: typing.Optional[int] = OMIT,
-        annotation_draft: typing.Optional[int] = OMIT,
+        annotation_draft_id: typing.Optional[int] = OMIT,
         meta: typing.Optional[typing.Any] = OMIT,
         review: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -1287,7 +1287,7 @@ async def create_event(
         annotation : typing.Optional[int]
             Annotation ID associated with this event
 
-        annotation_draft : typing.Optional[int]
+        annotation_draft_id : typing.Optional[int]
             Draft annotation ID associated with this event
 
         meta : typing.Optional[typing.Any]
@@ -1333,7 +1333,7 @@ async def main() -> None:
             event_key=event_key,
             event_time=event_time,
             annotation=annotation,
-            annotation_draft=annotation_draft,
+            annotation_draft_id=annotation_draft_id,
             meta=meta,
             review=review,
             request_options=request_options,

src/label_studio_sdk/tasks/raw_client.py

@@ -610,7 +610,7 @@ def create_event(
         event_key: str,
         event_time: dt.datetime,
         annotation: typing.Optional[int] = OMIT,
-        annotation_draft: typing.Optional[int] = OMIT,
+        annotation_draft_id: typing.Optional[int] = OMIT,
         meta: typing.Optional[typing.Any] = OMIT,
         review: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -680,7 +680,7 @@ def create_event(
         annotation : typing.Optional[int]
             Annotation ID associated with this event
 
-        annotation_draft : typing.Optional[int]
+        annotation_draft_id : typing.Optional[int]
             Draft annotation ID associated with this event
 
         meta : typing.Optional[typing.Any]
@@ -702,7 +702,7 @@ def create_event(
             method="POST",
             json={
                 "annotation": annotation,
-                "annotation_draft": annotation_draft,
+                "annotation_draft_id": annotation_draft_id,
                 "event_key": event_key,
                 "event_time": event_time,
                 "meta": meta,
@@ -1365,7 +1365,7 @@ async def create_event(
         event_key: str,
         event_time: dt.datetime,
         annotation: typing.Optional[int] = OMIT,
-        annotation_draft: typing.Optional[int] = OMIT,
+        annotation_draft_id: typing.Optional[int] = OMIT,
         meta: typing.Optional[typing.Any] = OMIT,
         review: typing.Optional[int] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -1435,7 +1435,7 @@ async def create_event(
         annotation : typing.Optional[int]
             Annotation ID associated with this event
 
-        annotation_draft : typing.Optional[int]
+        annotation_draft_id : typing.Optional[int]
             Draft annotation ID associated with this event
 
         meta : typing.Optional[typing.Any]
@@ -1457,7 +1457,7 @@ async def create_event(
             method="POST",
             json={
                 "annotation": annotation,
-                "annotation_draft": annotation_draft,
+                "annotation_draft_id": annotation_draft_id,
                 "event_key": event_key,
                 "event_time": event_time,
                 "meta": meta,

src/label_studio_sdk/types/organization_member_tag.py

@@ -6,11 +6,12 @@
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
+from .user_simple import UserSimple
 
 
 class OrganizationMemberTag(UncheckedBaseModel):
     created_at: typing.Optional[dt.datetime] = None
-    created_by: typing.Optional[int] = None
+    created_by: typing.Optional[UserSimple] = None
     id: typing.Optional[int] = None
     label: str
     member_count: typing.Optional[int] = None

src/label_studio_sdk/types/task_event.py

@@ -22,7 +22,7 @@ class TaskEvent(UncheckedBaseModel):
     Annotation ID associated with this event
     """
 
-    annotation_draft: typing.Optional[int] = pydantic.Field(default=None)
+    annotation_draft_id: typing.Optional[int] = pydantic.Field(default=None)
     """
     Draft annotation ID associated with this event
     """