chore: dia-2209: trigger follow-merge (#444)

Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>

Author: robot-ci-heartex

.mock/definition/__package__.yml

@@ -24,6 +24,14 @@ errors:
     type: unknown
     docs: Invalid refresh token
 types:
+  AnnotationCompletedBy:
+    discriminated: false
+    union:
+      - UserSimple
+      - integer
+    source:
+      openapi: openapi/openapi.yaml
+    inline: true
   AnnotationLastAction:
     enum:
       - prediction
@@ -55,7 +63,7 @@ types:
         default: ''
         validation:
           minLength: 1
-      completed_by: optional<integer>
+      completed_by: optional<AnnotationCompletedBy>
       unique_id:
         type: optional<string>
         validation:

.mock/definition/jwtSettings.yml

@@ -9,7 +9,7 @@ service:
       method: GET
       auth: true
       docs: |
-        Retrieve JWT settings for the currently active organization.
+        Retrieve JWT settings for the currently-active organization.
       source:
         openapi: openapi/openapi.yaml
       display-name: Retrieve JWT Settings

.mock/openapi/openapi.yaml

@@ -7663,7 +7663,9 @@ components:
           minLength: 1
         completed_by:
           title: Completed by
-          type: integer
+          anyOf:
+            - $ref: "#/components/schemas/UserSimple"
+            - integer
         unique_id:
           title: Unique id
           type: string

poetry.lock

@@ -3,7 +3,7 @@ name = "label-studio-sdk"
 
 [tool.poetry]
 name = "label-studio-sdk"
-version = "1.0.12.dev"
+version = "1.0.12"
 description = ""
 readme = "README.md"
 authors = []
@@ -40,13 +40,11 @@ appdirs = ">=1.4.3"
 datamodel-code-generator = "0.26.1"
 httpx = ">=0.21.2"
 ijson = ">=3.2.3"
-jinja2 = ">=3.1.6,<4.0"
 jsf = "^0.11.2"
 jsonschema = ">=4.23.0"
 lxml = ">=4.2.5"
 nltk = "^3.9.1"
 numpy = ">=1.26.4,<3.0.0"
-opencv-python = "^4.9.0" #add openCV
 pandas = ">=0.24.0"
 pydantic = ">= 1.9.2"
 pydantic-core = "^2.18.2"
@@ -80,6 +78,3 @@ line-length = 120
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[project.scripts]
-label-studio-converter = "label_studio_sdk.converter.main:main"

pyproject.toml

@@ -8398,7 +8398,7 @@ client.tokens.refresh(
 <dl>
 <dd>
 
-Retrieve JWT settings for the currently active organization.
+Retrieve JWT settings for the currently-active organization.
 </dd>
 </dl>
 </dd>

reference.md

@@ -3,6 +3,7 @@
 from .types import (
     AccessTokenResponse,
     Annotation,
+    AnnotationCompletedBy,
     AnnotationFilterOptions,
     AnnotationLastAction,
     AnnotationsDmField,
@@ -200,6 +201,7 @@
     "ActionsCreateRequestSelectedItemsExcluded",
     "ActionsCreateRequestSelectedItemsIncluded",
     "Annotation",
+    "AnnotationCompletedBy",
     "AnnotationFilterOptions",
     "AnnotationLastAction",
     "AnnotationsCreateBulkRequestSelectedItems",

src/label_studio_sdk/__init__.py

@@ -19,7 +19,7 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
 
     def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> JwtSettingsResponse:
         """
-        Retrieve JWT settings for the currently active organization.
+        Retrieve JWT settings for the currently-active organization.
 
         Parameters
         ----------
@@ -134,7 +134,7 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
 
     async def get(self, *, request_options: typing.Optional[RequestOptions] = None) -> JwtSettingsResponse:
         """
-        Retrieve JWT settings for the currently active organization.
+        Retrieve JWT settings for the currently-active organization.
 
         Parameters
         ----------

src/label_studio_sdk/jwt_settings/client.py

@@ -2,6 +2,7 @@
 
 from .access_token_response import AccessTokenResponse
 from .annotation import Annotation
+from .annotation_completed_by import AnnotationCompletedBy
 from .annotation_filter_options import AnnotationFilterOptions
 from .annotation_last_action import AnnotationLastAction
 from .annotations_dm_field import AnnotationsDmField
@@ -108,6 +109,7 @@
 __all__ = [
     "AccessTokenResponse",
     "Annotation",
+    "AnnotationCompletedBy",
     "AnnotationFilterOptions",
     "AnnotationLastAction",
     "AnnotationsDmField",

src/label_studio_sdk/types/__init__.py

@@ -3,6 +3,7 @@
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing
 import pydantic
+from .annotation_completed_by import AnnotationCompletedBy
 import datetime as dt
 from .annotation_last_action import AnnotationLastAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
@@ -25,7 +26,7 @@ class Annotation(UniversalBaseModel):
     Time delta from creation time
     """
 
-    completed_by: typing.Optional[int] = None
+    completed_by: typing.Optional[AnnotationCompletedBy] = None
     unique_id: typing.Optional[str] = None
     was_cancelled: typing.Optional[bool] = pydantic.Field(default=None)
     """