fix: soft delete helper
This commit is contained in:
@@ -16,7 +16,7 @@ from common.db.models import (
|
|||||||
)
|
)
|
||||||
from common.ids import new_ulid
|
from common.ids import new_ulid
|
||||||
from common.storage.schemas import ServerObjectRequest
|
from common.storage.schemas import ServerObjectRequest
|
||||||
from common.storage import build_storage_uri
|
from common.storage import actual_bucket_name, build_storage_uri
|
||||||
from fastapi import (
|
from fastapi import (
|
||||||
APIRouter,
|
APIRouter,
|
||||||
BackgroundTasks,
|
BackgroundTasks,
|
||||||
@@ -483,7 +483,7 @@ async def create_script_record(
|
|||||||
# suffix so the new row gets a distinct object_key.
|
# suffix so the new row gets a distinct object_key.
|
||||||
object_key = await _resolve_unique_object_key(session, object_key)
|
object_key = await _resolve_unique_object_key(session, object_key)
|
||||||
object_key_hash = hashlib.sha256(object_key.encode("utf-8")).digest()
|
object_key_hash = hashlib.sha256(object_key.encode("utf-8")).digest()
|
||||||
bucket_name = settings.s3_workspace_bucket
|
bucket_name = actual_bucket_name("workspace")
|
||||||
mime_type = mimetypes.guess_type(jupyter_basename)[0]
|
mime_type = mimetypes.guess_type(jupyter_basename)[0]
|
||||||
storage_object = StorageObjects(
|
storage_object = StorageObjects(
|
||||||
storage_object_id=object_id,
|
storage_object_id=object_id,
|
||||||
|
|||||||
@@ -190,7 +190,9 @@ def _resolve_bucket_for_usage(
|
|||||||
from backend.storage_api import BUCKET_FOR_USAGE
|
from backend.storage_api import BUCKET_FOR_USAGE
|
||||||
if workspace_artifact_bucket:
|
if workspace_artifact_bucket:
|
||||||
return workspace_artifact_bucket
|
return workspace_artifact_bucket
|
||||||
return BUCKET_FOR_USAGE.get(usage_type, settings.s3_workspace_bucket)
|
return BUCKET_FOR_USAGE.get(
|
||||||
|
usage_type, actual_bucket_name(USAGE_TYPE_TO_PURPOSE.get(usage_type, "workspace"))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def create_upload_record(
|
async def create_upload_record(
|
||||||
|
|||||||
Reference in New Issue
Block a user