Remove install package from Pipfile since it doesn't exist anymore …

…(who knows what it was for in the first place). Fix version to `pydantic = "1.10.13"`.
clowder-framework · Jul 21, 2024 · b1c120c · b1c120c
1 parent 120097d
commit b1c120c
Show file tree

Hide file tree

Showing 22 changed files with 2,597 additions and 2,726 deletions.
diff --git a/backend/Pipfile b/backend/Pipfile
@@ -5,6 +5,7 @@ name = "pypi"
 
 [packages]
 fastapi = "0.95.1"
+pydantic = "1.10.13"
 uvicorn = "0.21.1"
 motor = "3.1.2"
 mongoengine = "0.27.0"
@@ -21,7 +22,6 @@ pika = "1.3.1"
 aio-pika = "9.0.5"
 elasticsearch = "8.7.0"
 pipenv = "2023.4.20"
-install = "1.3.5"
 rocrate = "0.7.0"
 httpx = "0.24.0"
 packaging = "23.1"

diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/frontend/src/openapi/v2/models/AuthorizationOut.ts b/frontend/src/openapi/v2/models/AuthorizationOut.ts
@@ -15,5 +15,8 @@ export type AuthorizationOut = {
     user_ids?: Array<string>;
     role: RoleType;
     group_ids?: Array<string>;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/DatasetFreezeOut.ts b/frontend/src/openapi/v2/models/DatasetFreezeOut.ts
@@ -11,11 +11,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type DatasetFreezeOut = {
     name?: string;
@@ -30,6 +25,9 @@ export type DatasetFreezeOut = {
     origin_id?: string;
     standard_license?: boolean;
     license_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
     frozen_version_num: number;

diff --git a/frontend/src/openapi/v2/models/DatasetOut.ts b/frontend/src/openapi/v2/models/DatasetOut.ts
@@ -11,11 +11,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type DatasetOut = {
     name?: string;
@@ -30,6 +25,9 @@ export type DatasetOut = {
     origin_id?: string;
     standard_license?: boolean;
     license_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
     frozen_version_num?: number;

diff --git a/frontend/src/openapi/v2/models/EventListenerJobDB.ts b/frontend/src/openapi/v2/models/EventListenerJobDB.ts
@@ -20,5 +20,8 @@ export type EventListenerJobDB = {
     duration?: number;
     latest_message?: string;
     status?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     _id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/EventListenerJobOut.ts b/frontend/src/openapi/v2/models/EventListenerJobOut.ts
@@ -20,5 +20,8 @@ export type EventListenerJobOut = {
     duration?: number;
     latest_message?: string;
     status?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/EventListenerJobUpdateOut.ts b/frontend/src/openapi/v2/models/EventListenerJobUpdateOut.ts
@@ -9,15 +9,13 @@
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type EventListenerJobUpdateOut = {
     job_id: string;
     timestamp?: string;
     status: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/EventListenerOut.ts b/frontend/src/openapi/v2/models/EventListenerOut.ts
@@ -12,6 +12,9 @@ export type EventListenerOut = {
     name: string;
     version?: string;
     description?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     creator?: UserOut;
     created?: string;

diff --git a/frontend/src/openapi/v2/models/FeedOut.ts b/frontend/src/openapi/v2/models/FeedOut.ts
@@ -12,17 +12,15 @@ import type { SearchObject } from './SearchObject';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type FeedOut = {
     name: string;
     description?: string;
     search: SearchObject;
     listeners?: Array<FeedListener>;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     creator?: string;
     created?: string;

diff --git a/frontend/src/openapi/v2/models/FileOut.ts b/frontend/src/openapi/v2/models/FileOut.ts
@@ -13,11 +13,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type FileOut = {
     name?: string;
@@ -37,6 +32,9 @@ export type FileOut = {
     storage_path?: string;
     object_type?: string;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
 }
diff --git a/frontend/src/openapi/v2/models/FolderOut.ts b/frontend/src/openapi/v2/models/FolderOut.ts
@@ -11,11 +11,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type FolderOut = {
     name?: string;
@@ -26,6 +21,9 @@ export type FolderOut = {
     modified?: string;
     object_type?: string;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
 }
diff --git a/frontend/src/openapi/v2/models/GroupOut.ts b/frontend/src/openapi/v2/models/GroupOut.ts
@@ -11,11 +11,6 @@ import type { Member } from './Member';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type GroupOut = {
     creator: string;
@@ -24,6 +19,9 @@ export type GroupOut = {
     name: string;
     description?: string;
     users?: Array<Member>;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     views?: number;
 }
diff --git a/frontend/src/openapi/v2/models/LicenseOut.ts b/frontend/src/openapi/v2/models/LicenseOut.ts
@@ -9,11 +9,6 @@
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type LicenseOut = {
     creator: string;
@@ -25,5 +20,8 @@ export type LicenseOut = {
     version?: string;
     holders?: string;
     expiration_date?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/MetadataDefinitionOut.ts b/frontend/src/openapi/v2/models/MetadataDefinitionOut.ts
@@ -13,11 +13,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type MetadataDefinitionOut = {
     name: string;
@@ -28,6 +23,9 @@ export type MetadataDefinitionOut = {
     context_url?: string;
     fields: Array<MetadataField>;
     modified?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     creator: UserOut;
 }
diff --git a/frontend/src/openapi/v2/models/MetadataOut.ts b/frontend/src/openapi/v2/models/MetadataOut.ts
@@ -12,11 +12,6 @@ import type { MongoDBRef } from './MongoDBRef';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type MetadataOut = {
     '@context'?: Array<string>;
@@ -28,6 +23,9 @@ export type MetadataOut = {
     agent: MetadataAgent;
     created?: string;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
 }
diff --git a/frontend/src/openapi/v2/models/ThumbnailOut.ts b/frontend/src/openapi/v2/models/ThumbnailOut.ts
@@ -12,11 +12,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type ThumbnailOut = {
     creator: UserOut;
@@ -26,6 +21,9 @@ export type ThumbnailOut = {
     content_type?: ContentType;
     downloads?: number;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
 }
diff --git a/frontend/src/openapi/v2/models/UserAPIKeyOut.ts b/frontend/src/openapi/v2/models/UserAPIKeyOut.ts
@@ -9,17 +9,15 @@
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type UserAPIKeyOut = {
     name: string;
     key: string;
     user: string;
     created?: string;
     expires?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
 }
diff --git a/frontend/src/openapi/v2/models/UserOut.ts b/frontend/src/openapi/v2/models/UserOut.ts
@@ -9,16 +9,14 @@
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type UserOut = {
     email: string;
     first_name: string;
     last_name: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     admin?: boolean;
     admin_mode?: boolean;

diff --git a/frontend/src/openapi/v2/models/VisualizationConfigOut.ts b/frontend/src/openapi/v2/models/VisualizationConfigOut.ts
@@ -14,11 +14,6 @@ import type { VisualizationDataOut } from './VisualizationDataOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type VisualizationConfigOut = {
     resource: MongoDBRef;
@@ -29,6 +24,9 @@ export type VisualizationConfigOut = {
     visualization_component_id: string;
     visualization_mimetype: string;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
     visualization_data?: Array<VisualizationDataOut>;

diff --git a/frontend/src/openapi/v2/models/VisualizationDataOut.ts b/frontend/src/openapi/v2/models/VisualizationDataOut.ts
@@ -12,11 +12,6 @@ import type { UserOut } from './UserOut';
  *
  * - `id` - MongoDB document ObjectID "_id" field.
  * Mapped to the PydanticObjectId class
- *
- * Inherited from:
- *
- * - Pydantic BaseModel
- * - [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)
  */
 export type VisualizationDataOut = {
     name?: string;
@@ -28,6 +23,9 @@ export type VisualizationDataOut = {
     content_type?: ContentType;
     visualization_config_id: string;
     origin_id?: string;
+    /**
+     * MongoDB document ObjectID
+     */
     id?: string;
     frozen?: boolean;
 }