Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/rabbitmq/listeners.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async def create_reply_queue():
for _ in range(10)
)
config_entry = ConfigEntryDB(key="instance_id", value=instance_id)
await db["config"].insert_one(config_entry.to_mongo())
db["config"].insert_one(config_entry.to_mongo())

queue_name = "clowder.%s" % instance_id
channel.exchange_declare(exchange="clowder", durable=True)
Expand Down
2 changes: 1 addition & 1 deletion backend/app/routers/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ async def get_file_extract(
raise HTTPException(status_code=404, detail=f"File {file_id} not found")


@router.post("/{file_id}/extract")
@router.post("/{file_id}/resubmit_extract")
async def resubmit_file_extractions(
file_id: str,
credentials: HTTPAuthorizationCredentials = Security(security),
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/openapi/v2/services/AuthService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ export class AuthService {
* Get Idenity Provider Token
* Get identity provider JWT token from keyclok. Keycloak must be configured to store external tokens.
* @param identityProvider
* @returns any Successful Response
* @returns string Successful Response
* @throws ApiError
*/
public static getIdenityProviderTokenApiV2AuthBrokerIdentityProviderTokenGet(
identityProvider: string,
): CancelablePromise<any> {
): CancelablePromise<string> {
return __request({
method: 'GET',
path: `/api/v2/auth/broker/${identityProvider}/token`,
Expand Down
31 changes: 29 additions & 2 deletions frontend/src/openapi/v2/services/FilesService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,33 @@ export class FilesService {
});
}

/**
* Get File Extract
* @param fileId
* @param extractorName
* @param requestBody
* @returns any Successful Response
* @throws ApiError
*/
public static getFileExtractApiV2FilesFileIdExtractPost(
fileId: string,
extractorName: string,
requestBody?: any,
): CancelablePromise<any> {
return __request({
method: 'POST',
path: `/api/v2/files/${fileId}/extract`,
query: {
'extractorName': extractorName,
},
body: requestBody,
mediaType: 'application/json',
errors: {
422: `Validation Error`,
},
});
}

/**
* Resubmit File Extractions
* This route will check metadata. We get the extractors run from metadata from extractors.
Expand All @@ -131,12 +158,12 @@ export class FilesService {
* @returns any Successful Response
* @throws ApiError
*/
public static resubmitFileExtractionsApiV2FilesFileIdExtractPost(
public static resubmitFileExtractionsApiV2FilesFileIdResubmitExtractPost(
fileId: string,
): CancelablePromise<any> {
return __request({
method: 'POST',
path: `/api/v2/files/${fileId}/extract`,
path: `/api/v2/files/${fileId}/resubmit_extract`,
errors: {
422: `Validation Error`,
},
Expand Down