minor fixes

s3worker/client.py

@@ -243,7 +243,7 @@ def get_bucket_name():
 
 
 def get_prefix():
-    return settings.papermerge__s3__object_prefix
+    return settings.papermerge__main__prefix
 
 
 def get_media_root():

s3worker/config.py

@@ -8,8 +8,8 @@ class Settings(BaseSettings):
     aws_secret_access_key: str
     aws_region_name: str | None = None
     papermerge__s3__bucket_name: str
-    papermerge__s3__object_prefix: str = ''
     papermerge__redis__url: str | None = None
+    papermerge__main__prefix: str = ''
     papermerge__main__media_root: str
     papermerge__main__logging_cfg: Path | None = None
     papermerge__database__url: str = 'sqlite:////db/db.sqlite3'

s3worker/db/models.py

@@ -1,13 +1,12 @@
 from uuid import UUID
-from sqlalchemy import Column, ForeignKey, String, Table, func
+from sqlalchemy import ForeignKey
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
 
 
 class Base(DeclarativeBase):
     pass
 
 
-
 class Document(Base):
     __tablename__ = "core_document"