Allow install in ^3.x Python projects

vintasoftware · Jul 5, 2024 · f026c57 · f026c57
1 parent adae65d
commit f026c57
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 228 deletions.
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.12.3
+3.12.4
diff --git a/frontend/openapi_schema.json b/frontend/openapi_schema.json
@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "django_ai_assistant",
-    "version": "0.0.2",
+    "version": "0.0.1",
     "description": ""
   },
   "paths": {

diff --git a/frontend/src/client/core/ApiRequestOptions.ts b/frontend/src/client/core/ApiRequestOptions.ts
@@ -1,4 +1,4 @@
-export type ApiRequestOptions<T = unknown> = {
+export type ApiRequestOptions = {
 	readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
 	readonly url: string;
 	readonly path?: Record<string, unknown>;
@@ -9,6 +9,5 @@ export type ApiRequestOptions<T = unknown> = {
 	readonly body?: any;
 	readonly mediaType?: string;
 	readonly responseHeader?: string;
-	readonly responseTransformer?: (data: unknown) => T;
 	readonly errors?: Record<number | string, string>;
 };
diff --git a/frontend/src/client/core/OpenAPI.ts b/frontend/src/client/core/OpenAPI.ts
@@ -3,7 +3,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 
 type Headers = Record<string, string>;
 type Middleware<T> = (value: T) => T | Promise<T>;
-type Resolver<T> = (options: ApiRequestOptions<T>) => Promise<T>;
+type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 
 export class Interceptors<T> {
   _fns: Middleware<T>[];
@@ -48,7 +48,7 @@ export const OpenAPI: OpenAPIConfig = {
 	PASSWORD: undefined,
 	TOKEN: undefined,
 	USERNAME: undefined,
-	VERSION: '0.0.2',
+	VERSION: '0.0.1',
 	WITH_CREDENTIALS: false,
 	interceptors: {
 		request: new Interceptors(),

diff --git a/frontend/src/client/core/request.ts b/frontend/src/client/core/request.ts
@@ -108,24 +108,20 @@ export const getFormData = (options: ApiRequestOptions): FormData | undefined =>
 	return undefined;
 };
 
-type Resolver<T> = (options: ApiRequestOptions<T>) => Promise<T>;
+type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 
-export const resolve = async <T>(options: ApiRequestOptions<T>, resolver?: T | Resolver<T>): Promise<T | undefined> => {
+export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
 	if (typeof resolver === 'function') {
 		return (resolver as Resolver<T>)(options);
 	}
 	return resolver;
 };
 
-export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Record<string, string>> => {
+export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Record<string, string>> => {
 	const [token, username, password, additionalHeaders] = await Promise.all([
-		// @ts-ignore
 		resolve(options, config.TOKEN),
-		// @ts-ignore
 		resolve(options, config.USERNAME),
-		// @ts-ignore
 		resolve(options, config.PASSWORD),
-		// @ts-ignore
 		resolve(options, config.HEADERS),
 	]);
 
@@ -177,7 +173,7 @@ export const getRequestBody = (options: ApiRequestOptions): unknown => {
 
 export const sendRequest = async <T>(
 	config: OpenAPIConfig,
-	options: ApiRequestOptions<T>,
+	options: ApiRequestOptions,
 	url: string,
 	body: unknown,
 	formData: FormData | undefined,
@@ -305,7 +301,7 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
  * @returns CancelablePromise<T>
  * @throws ApiError
  */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>, axiosClient: AxiosInstance = axios): CancelablePromise<T> => {
+export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise<T> => {
 	return new CancelablePromise(async (resolve, reject, onCancel) => {
 		try {
 			const url = getUrl(config, options);
@@ -323,17 +319,12 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>,
 				const responseBody = getResponseBody(response);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
-				let transformedBody = responseBody;
-				if (options.responseTransformer && isSuccess(response.status)) {
-					transformedBody = options.responseTransformer(responseBody)
-				}
-
 				const result: ApiResult = {
 					url,
 					ok: isSuccess(response.status),
 					status: response.status,
 					statusText: response.statusText,
-					body: responseHeader ?? transformedBody,
+					body: responseHeader ?? responseBody,
 				};
 
 				catchErrorCodes(options, result);