feat: OPTIC-1360: [BE] create Account settings endpoints that handle …

…existing functionality in the django template (#364) Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Co-authored-by: Marcel Canu <[email protected]>
HumanSignal · Dec 4, 2024 · 83ec0f8 · 83ec0f8
1 parent 114c2b3
commit 83ec0f8
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 2 deletions.
diff --git a/.mock/definition/__package__.yml b/.mock/definition/__package__.yml
@@ -128,6 +128,7 @@ types:
       allow_newsletters:
         type: optional<boolean>
         docs: Allow sending newsletters to user
+      date_joined: optional<datetime>
     source:
       openapi: openapi/openapi.yaml
   Filter:
@@ -373,6 +374,7 @@ types:
         validation:
           format: email
           maxLength: 254
+      created_at: optional<datetime>
     source:
       openapi: openapi/openapi.yaml
   Organization:
@@ -430,6 +432,7 @@ types:
       allow_newsletters:
         type: optional<boolean>
         docs: Allow sending newsletters to user
+      date_joined: optional<datetime>
       created_projects: optional<string>
       contributed_to_projects: optional<string>
     source:
@@ -2265,6 +2268,19 @@ types:
         docs: A unique integer value identifying this project.
     source:
       openapi: openapi/openapi.yaml
+  OrganizationMember:
+    properties:
+      user:
+        type: integer
+        docs: User ID
+      organization:
+        type: integer
+        docs: Organization ID
+      contributed_projects_count: optional<string>
+      annotations_count: optional<string>
+      created_at: optional<datetime>
+    source:
+      openapi: openapi/openapi.yaml
   PromptCreatedBy:
     discriminated: false
     docs: User ID of the creator of the prompt

diff --git a/.mock/definition/organizations.yml b/.mock/definition/organizations.yml
@@ -54,6 +54,7 @@ service:
               - id: 1
                 title: title
                 contact_info: contact_info
+                created_at: '2024-01-15T09:30:00Z'
     get:
       path: /api/organizations/{id}
       method: GET

diff --git a/.mock/definition/organizations/members.yml b/.mock/definition/organizations/members.yml
@@ -55,6 +55,33 @@ service:
                   organization: 1
                   user:
                     username: username
+    get:
+      path: /api/organizations/{id}/memberships/{user_pk}/
+      method: GET
+      auth: true
+      docs: Get organization member details by user ID.
+      path-parameters:
+        id: string
+        user_pk:
+          type: integer
+          docs: >-
+            A unique integer value identifying the user to get organization
+            details for.
+      display-name: Get organization member details
+      response:
+        docs: ''
+        type: root.OrganizationMember
+      examples:
+        - path-parameters:
+            id: id
+            user_pk: 1
+          response:
+            body:
+              user: 1
+              organization: 1
+              contributed_projects_count: contributed_projects_count
+              annotations_count: annotations_count
+              created_at: '2024-01-15T09:30:00Z'
     delete:
       path: /api/organizations/{id}/memberships/{user_pk}/
       method: DELETE

diff --git a/.mock/definition/users.yml b/.mock/definition/users.yml
@@ -80,6 +80,7 @@ service:
               phone: phone
               active_organization: 1
               allow_newsletters: true
+              date_joined: '2024-01-15T09:30:00Z'
       audiences:
         - public
     list:
@@ -107,6 +108,7 @@ service:
                 phone: phone
                 active_organization: 1
                 allow_newsletters: true
+                date_joined: '2024-01-15T09:30:00Z'
       audiences:
         - public
     create:
@@ -166,6 +168,7 @@ service:
               phone: phone
               active_organization: 1
               allow_newsletters: true
+              date_joined: '2024-01-15T09:30:00Z'
       audiences:
         - public
     get:
@@ -202,6 +205,7 @@ service:
               phone: phone
               active_organization: 1
               allow_newsletters: true
+              date_joined: '2024-01-15T09:30:00Z'
       audiences:
         - public
     delete:
@@ -299,6 +303,7 @@ service:
               phone: phone
               active_organization: 1
               allow_newsletters: true
+              date_joined: '2024-01-15T09:30:00Z'
       audiences:
         - public
   source:

diff --git a/.mock/openapi/openapi.yaml b/.mock/openapi/openapi.yaml
@@ -8279,6 +8279,10 @@ components:
           description: Allow sending newsletters to user
           type: boolean
           nullable: true
+        date_joined:
+          title: Date joined
+          type: string
+          format: date-time
     Filter:
       required:
         - column
@@ -8696,6 +8700,11 @@ components:
           format: email
           maxLength: 254
           nullable: true
+        created_at:
+          title: Created at
+          type: string
+          format: date-time
+          readOnly: true
     Organization:
       required:
         - title
@@ -8794,6 +8803,10 @@ components:
           description: Allow sending newsletters to user
           type: boolean
           nullable: true
+        date_joined:
+          title: Date joined
+          type: string
+          format: date-time
         created_projects:
           title: Created projects
           type: string

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "label-studio-sdk"
-version = "1.0.9.dev"
+version = "1.0.9"
 description = ""
 readme = "README.md"
 authors = []

diff --git a/src/label_studio_sdk/core/client_wrapper.py b/src/label_studio_sdk/core/client_wrapper.py
@@ -17,7 +17,7 @@ def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "label-studio-sdk",
-            "X-Fern-SDK-Version": "1.0.8",
+            "X-Fern-SDK-Version": "1.0.9",
         }
         headers["Authorization"] = f"Token  {self.api_key}"
         return headers

diff --git a/src/label_studio_sdk/types/base_user.py b/src/label_studio_sdk/types/base_user.py
@@ -23,6 +23,8 @@ class BaseUser(pydantic_v1.BaseModel):
     Allow sending newsletters to user
     """
 
+    date_joined: typing.Optional[dt.datetime] = None
+
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
         return super().json(**kwargs_with_defaults)

diff --git a/tests/test_users.py b/tests/test_users.py
@@ -40,6 +40,7 @@ async def test_whoami(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": "phone",
         "active_organization": 1,
         "allow_newsletters": True,
+        "date_joined": "2024-01-15T09:30:00Z",
     }
     expected_types: typing.Any = {
         "id": "integer",
@@ -53,6 +54,7 @@ async def test_whoami(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": None,
         "active_organization": "integer",
         "allow_newsletters": None,
+        "date_joined": "datetime",
     }
     response = client.users.whoami()
     validate_response(response, expected_response, expected_types)
@@ -75,6 +77,7 @@ async def test_list_(client: LabelStudio, async_client: AsyncLabelStudio) -> Non
             "phone": "phone",
             "active_organization": 1,
             "allow_newsletters": True,
+            "date_joined": "2024-01-15T09:30:00Z",
         }
     ]
     expected_types: typing.Any = (
@@ -92,6 +95,7 @@ async def test_list_(client: LabelStudio, async_client: AsyncLabelStudio) -> Non
                 "phone": None,
                 "active_organization": "integer",
                 "allow_newsletters": None,
+                "date_joined": "datetime",
             }
         },
     )
@@ -115,6 +119,7 @@ async def test_create(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": "phone",
         "active_organization": 1,
         "allow_newsletters": True,
+        "date_joined": "2024-01-15T09:30:00Z",
     }
     expected_types: typing.Any = {
         "id": "integer",
@@ -128,6 +133,7 @@ async def test_create(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": None,
         "active_organization": "integer",
         "allow_newsletters": None,
+        "date_joined": "datetime",
     }
     response = client.users.create()
     validate_response(response, expected_response, expected_types)
@@ -149,6 +155,7 @@ async def test_get(client: LabelStudio, async_client: AsyncLabelStudio) -> None:
         "phone": "phone",
         "active_organization": 1,
         "allow_newsletters": True,
+        "date_joined": "2024-01-15T09:30:00Z",
     }
     expected_types: typing.Any = {
         "id": "integer",
@@ -162,6 +169,7 @@ async def test_get(client: LabelStudio, async_client: AsyncLabelStudio) -> None:
         "phone": None,
         "active_organization": "integer",
         "allow_newsletters": None,
+        "date_joined": "datetime",
     }
     response = client.users.get(id=1)
     validate_response(response, expected_response, expected_types)
@@ -190,6 +198,7 @@ async def test_update(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": "phone",
         "active_organization": 1,
         "allow_newsletters": True,
+        "date_joined": "2024-01-15T09:30:00Z",
     }
     expected_types: typing.Any = {
         "id": "integer",
@@ -203,6 +212,7 @@ async def test_update(client: LabelStudio, async_client: AsyncLabelStudio) -> No
         "phone": None,
         "active_organization": "integer",
         "allow_newsletters": None,
+        "date_joined": "datetime",
     }
     response = client.users.update(id=1)
     validate_response(response, expected_response, expected_types)