From 57af2f1abbadd59d56ea91a7bc1ab49eb8cfd711 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 20 Dec 2024 11:34:04 +0000 Subject: [PATCH 01/17] feat: DIA-1748: Add API schema def for product tour and in projects --- fern/openapi/openapi.yaml | 3 +++ fern/openapi/overrides.yaml | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/fern/openapi/openapi.yaml b/fern/openapi/openapi.yaml index 598f2de..647cf9b 100644 --- a/fern/openapi/openapi.yaml +++ b/fern/openapi/openapi.yaml @@ -8982,6 +8982,9 @@ components: title: Organization type: integer nullable: true + prompt: + $ref: "#/components/schemas/Prompt" + nullable: true color: title: Color type: string diff --git a/fern/openapi/overrides.yaml b/fern/openapi/overrides.yaml index 60b6db9..4499e3a 100644 --- a/fern/openapi/overrides.yaml +++ b/fern/openapi/overrides.yaml @@ -1,4 +1,18 @@ paths: + /api/current-user/product-tour: + get: + $ref: "./resources/users.yaml#/paths/~1api~1current-user~1product-tour/get" + x-fern-sdk-group-name: users + x-fern-sdk-method-name: get_product_tour + x-fern-audiences: + - internal + patch: + $ref: "./resources/users.yaml#/paths/~1api~1current-user~1product-tour/patch" + x-fern-sdk-group-name: users + x-fern-sdk-method-name: update_product_tour + x-fern-audiences: + - internal + /api/prompts/: get: $ref: "./resources/prompts.yaml#/paths/~1api~1prompts/get" From 6ac2164be64bb1084291d18dbb321c66451a3fc9 Mon Sep 17 00:00:00 2001 From: Matt Bernstein Date: Fri, 20 Dec 2024 08:51:16 -0500 Subject: [PATCH 02/17] add JSF def for LabelInterface in SDK --- fern/generators.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/fern/generators.yml b/fern/generators.yml index ec588a9..1c9e533 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -48,6 +48,7 @@ groups: requests-mock: '1.12.1' numpy: '<2.0.0' datamodel-code-generator: '0.26.1' + jsf: '^0.11.2' # scikit-learn: '1.5.1' smart-casing: true python-sdk-local: From 794dc8a4bec99fa4f128224d587ef959954a2daa Mon Sep 17 00:00:00 2001 From: Matt Bernstein Date: Fri, 20 Dec 2024 09:58:36 -0500 Subject: [PATCH 03/17] bump numpy version --- fern/generators.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index 1c9e533..fdb1762 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -46,7 +46,7 @@ groups: xmljson: '0.2.1' jsonschema: '>=4.23.0' requests-mock: '1.12.1' - numpy: '<2.0.0' + numpy: '^1.26.4' datamodel-code-generator: '0.26.1' jsf: '^0.11.2' # scikit-learn: '1.5.1' From 704bbaadb0a8967ee5c632c1831f3820d40be27c Mon Sep 17 00:00:00 2001 From: Nikita Belonogov Date: Fri, 20 Dec 2024 20:35:36 +0400 Subject: [PATCH 04/17] Set pyproject_python_version --- fern/generators.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index 7f6e922..47a50f5 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -33,7 +33,7 @@ groups: - from: _legacy imports: - Client -# pyproject_python_version: '^3.9' + pyproject_python_version: '>=3.9,<4' extra_dependencies: pandas: '>=0.24.0' requests: '>=2.22.0' From b134779e0687a067f9d69e0c830e079b76a7fa07 Mon Sep 17 00:00:00 2001 From: Nikita Belonogov Date: Fri, 20 Dec 2024 20:46:29 +0400 Subject: [PATCH 05/17] ci: Upgrade fern version --- fern/generators.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index a45091f..92d648f 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -33,7 +33,7 @@ groups: - from: _legacy imports: - Client -# pyproject_python_version: '^3.9' + pyproject_python_version: '>=3.9,<4' extra_dependencies: pandas: '>=0.24.0' requests: '>=2.22.0' From 34f51251234de80af2ed09a51ee6259605fb97e4 Mon Sep 17 00:00:00 2001 From: Nikita Belonogov Date: Fri, 20 Dec 2024 21:08:21 +0400 Subject: [PATCH 06/17] ad jsf --- fern/generators.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index 92d648f..cf79eca 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -46,8 +46,9 @@ groups: xmljson: '0.2.1' jsonschema: '>=4.23.0' requests-mock: '1.12.1' - numpy: '<2.0.0' + numpy: '>=1.26.4,<2.0.0' datamodel-code-generator: '0.26.1' + jsf: '^0.11.2' # scikit-learn: '1.5.1' smart-casing: true python-sdk-local: From e2c6b41a9952157f8f1c8cbe0264ef671b2fdddc Mon Sep 17 00:00:00 2001 From: Nikita Belonogov Date: Fri, 20 Dec 2024 21:33:03 +0400 Subject: [PATCH 07/17] Revert "ci: Bump fern version (#44)" This reverts commit f9a2ad8cb348fffaac38b29443f55a80257cf783. --- fern/fern.config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fern/fern.config.json b/fern/fern.config.json index 00bb7fa..59bece9 100644 --- a/fern/fern.config.json +++ b/fern/fern.config.json @@ -1,4 +1,4 @@ { "organization": "humansignal-org", - "version": "0.46.8" -} \ No newline at end of file + "version": "0.39.12" +} From 8fdf8ce01d5141af5402b69acf783fc0ba9eeaf8 Mon Sep 17 00:00:00 2001 From: Nikita Belonogov Date: Fri, 20 Dec 2024 21:39:01 +0400 Subject: [PATCH 08/17] revert fernapi/fern-python-sdk --- fern/generators.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fern/generators.yml b/fern/generators.yml index cf79eca..724765b 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -10,7 +10,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 4.3.10 + version: 2.14.0-rc0 output: location: pypi package-name: label-studio-sdk @@ -56,7 +56,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 4.3.10 + version: 3.10.3 output: location: local-file-system path: ../label_studio_sdk From fc5dde6abc7b5fdb7619cb82e4a8511daf5dbbe4 Mon Sep 17 00:00:00 2001 From: Sergey Zhuk Date: Tue, 24 Dec 2024 19:26:38 +0000 Subject: [PATCH 09/17] bump to 3.10 --- fern/generators.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index 724765b..a7017ca 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -33,7 +33,7 @@ groups: - from: _legacy imports: - Client - pyproject_python_version: '>=3.9,<4' + pyproject_python_version: '>=3.10,<4' extra_dependencies: pandas: '>=0.24.0' requests: '>=2.22.0' From 089ff9ee826c57456171b56c3064a0cc1f4b0e36 Mon Sep 17 00:00:00 2001 From: Sergey Zhuk Date: Tue, 24 Dec 2024 19:33:32 +0000 Subject: [PATCH 10/17] uograde fern --- fern/fern.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/fern.config.json b/fern/fern.config.json index 59bece9..c81817d 100644 --- a/fern/fern.config.json +++ b/fern/fern.config.json @@ -1,4 +1,4 @@ { "organization": "humansignal-org", - "version": "0.39.12" + "version": "0.46.12" } From 4f3ff96ede6fc23ba4f6c7f3e526f904afe7a814 Mon Sep 17 00:00:00 2001 From: Sergey Zhuk Date: Tue, 24 Dec 2024 19:38:34 +0000 Subject: [PATCH 11/17] downgrade python --- fern/generators.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/generators.yml b/fern/generators.yml index a7017ca..724765b 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -33,7 +33,7 @@ groups: - from: _legacy imports: - Client - pyproject_python_version: '>=3.10,<4' + pyproject_python_version: '>=3.9,<4' extra_dependencies: pandas: '>=0.24.0' requests: '>=2.22.0' From af1cd00229beeab7e9fd4eb242e6e576ffc3c30c Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 26 Dec 2024 01:14:08 +0300 Subject: [PATCH 12/17] Revert generators version --- fern/generators.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fern/generators.yml b/fern/generators.yml index 724765b..cf79eca 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -10,7 +10,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 2.14.0-rc0 + version: 4.3.10 output: location: pypi package-name: label-studio-sdk @@ -56,7 +56,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 3.10.3 + version: 4.3.10 output: location: local-file-system path: ../label_studio_sdk From c0d8e82cc6470dbef982a973c50d9550f72e8ba4 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 26 Dec 2024 01:30:56 +0300 Subject: [PATCH 13/17] prompt -> prompts --- fern/openapi/openapi.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fern/openapi/openapi.yaml b/fern/openapi/openapi.yaml index 647cf9b..e10cad0 100644 --- a/fern/openapi/openapi.yaml +++ b/fern/openapi/openapi.yaml @@ -8982,8 +8982,10 @@ components: title: Organization type: integer nullable: true - prompt: - $ref: "#/components/schemas/Prompt" + prompts: + type: array + items: + $ref: "#/components/schemas/Prompt" nullable: true color: title: Color From dd159a3dc09847f8c27e523b80caf6e9cd093ad6 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 26 Dec 2024 01:36:47 +0300 Subject: [PATCH 14/17] Add comment about audiences --- fern/openapi/overrides.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/fern/openapi/overrides.yaml b/fern/openapi/overrides.yaml index 4499e3a..dc65b3c 100644 --- a/fern/openapi/overrides.yaml +++ b/fern/openapi/overrides.yaml @@ -5,6 +5,7 @@ paths: x-fern-sdk-group-name: users x-fern-sdk-method-name: get_product_tour x-fern-audiences: + # internal is not used in the default generator - we skip function generation for this endpoint because it's not user facing - internal patch: $ref: "./resources/users.yaml#/paths/~1api~1current-user~1product-tour/patch" From 8c0cb9a6238b795765017f98233fdad03b3f8073 Mon Sep 17 00:00:00 2001 From: nik Date: Sat, 28 Dec 2024 01:31:20 +0300 Subject: [PATCH 15/17] ModelRun.model_version must be integer --- fern/openapi/resources/prompts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fern/openapi/resources/prompts.yaml b/fern/openapi/resources/prompts.yaml index 060aaae..f4369fc 100644 --- a/fern/openapi/resources/prompts.yaml +++ b/fern/openapi/resources/prompts.yaml @@ -690,7 +690,7 @@ components: type: integer model_version: title: Prompt Version ID - type: string + type: integer created_by: anyOf: - type: integer From 277bd6558cb9222cdfbc2d3fa8a25302c4ff9a02 Mon Sep 17 00:00:00 2001 From: nik Date: Sat, 28 Dec 2024 12:36:22 +0300 Subject: [PATCH 16/17] Fern upgrade --- fern/fern.config.json | 4 ++-- fern/generators.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fern/fern.config.json b/fern/fern.config.json index c81817d..b572109 100644 --- a/fern/fern.config.json +++ b/fern/fern.config.json @@ -1,4 +1,4 @@ { "organization": "humansignal-org", - "version": "0.46.12" -} + "version": "0.46.15" +} \ No newline at end of file diff --git a/fern/generators.yml b/fern/generators.yml index 724765b..a5995f4 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -10,15 +10,15 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 2.14.0-rc0 + version: 2.16.0 output: location: pypi package-name: label-studio-sdk github: repository: HumanSignal/label-studio-sdk # Branch and Mode will be automatically replaced during Follow Merge -# branch: fern-bot/08-05-2024-0231PM -# mode: push + # branch: fern-bot/08-05-2024-0231PM + # mode: push mode: pull-request config: inline_request_params: true @@ -49,14 +49,14 @@ groups: numpy: '>=1.26.4,<2.0.0' datamodel-code-generator: '0.26.1' jsf: '^0.11.2' -# scikit-learn: '1.5.1' + # scikit-learn: '1.5.1' smart-casing: true python-sdk-local: audiences: - public generators: - name: fernapi/fern-python-sdk - version: 3.10.3 + version: 3.10.8 output: location: local-file-system path: ../label_studio_sdk From a0578231f81cbcc5c30c1c6022b63b3d36219d4d Mon Sep 17 00:00:00 2001 From: nik Date: Sat, 28 Dec 2024 12:56:19 +0300 Subject: [PATCH 17/17] Upgrade to 4.x --- fern/generators.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fern/generators.yml b/fern/generators.yml index a5995f4..d87373e 100644 --- a/fern/generators.yml +++ b/fern/generators.yml @@ -10,7 +10,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 2.16.0 + version: 4.3.10 output: location: pypi package-name: label-studio-sdk @@ -56,7 +56,7 @@ groups: - public generators: - name: fernapi/fern-python-sdk - version: 3.10.8 + version: 4.3.10 output: location: local-file-system path: ../label_studio_sdk