data-syncmaster 0.2.0__tar.gz → 0.2.2__tar.gz

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: data-syncmaster
-Version: 0.2.0
+Version: 0.2.2
 Summary: Syncmaster REST API + Worker
 License: Apache-2.0
-Keywords: Syncmaster,REST,API,Worker,Replication
+Keywords: Syncmaster,REST,API,Worker,Spark,Transfer,ETL
 Author: DataOps.ETL
 Author-email: onetools@mts.ru
 Requires-Python: >=3.11,<4.0
@@ -19,10 +19,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
@@ -65,19 +61,19 @@ Description-Content-Type: text/x-rst
 Data.SyncMaster
 ===============
 
-|Repo Status| |PyPI| |PyPI License| |PyPI Python Version| |Docker image| |Documentation|
-|Build Status| |Coverage|  |pre-commit.ci|
+|Repo Status| |Docker image| |PyPI| |PyPI License| |PyPI Python Version| |Documentation|
+|Build Status| |Coverage| |pre-commit.ci|
 
 .. |Repo Status| image:: https://www.repostatus.org/badges/latest/wip.svg
     :target: https://www.repostatus.org/#wip
+.. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-server?sort=semver&label=docker
+    :target: https://hub.docker.com/r/mtsrus/syncmaster-server
 .. |PyPI| image:: https://img.shields.io/pypi/v/data-syncmaster
     :target: https://pypi.org/project/data-syncmaster/
 .. |PyPI License| image:: https://img.shields.io/pypi/l/data-syncmaster.svg
     :target: https://github.com/MobileTeleSystems/syncmaster/blob/develop/LICENSE.txt
 .. |PyPI Python Version| image:: https://img.shields.io/pypi/pyversions/data-syncmaster.svg
     :target: https://badge.fury.io/py/data-syncmaster
-.. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-server?sort=semver&label=docker
-    :target: https://hub.docker.com/r/mtsrus/syncmaster-server
 .. |Documentation| image:: https://readthedocs.org/projects/syncmaster/badge/?version=stable
     :target: https://syncmaster.readthedocs.io
 .. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Run%20All%20Tests/badge.svg

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/README.rst

@@ -3,19 +3,19 @@
 Data.SyncMaster
 ===============
 
-|Repo Status| |PyPI| |PyPI License| |PyPI Python Version| |Docker image| |Documentation|
-|Build Status| |Coverage|  |pre-commit.ci|
+|Repo Status| |Docker image| |PyPI| |PyPI License| |PyPI Python Version| |Documentation|
+|Build Status| |Coverage| |pre-commit.ci|
 
 .. |Repo Status| image:: https://www.repostatus.org/badges/latest/wip.svg
     :target: https://www.repostatus.org/#wip
+.. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-server?sort=semver&label=docker
+    :target: https://hub.docker.com/r/mtsrus/syncmaster-server
 .. |PyPI| image:: https://img.shields.io/pypi/v/data-syncmaster
     :target: https://pypi.org/project/data-syncmaster/
 .. |PyPI License| image:: https://img.shields.io/pypi/l/data-syncmaster.svg
     :target: https://github.com/MobileTeleSystems/syncmaster/blob/develop/LICENSE.txt
 .. |PyPI Python Version| image:: https://img.shields.io/pypi/pyversions/data-syncmaster.svg
     :target: https://badge.fury.io/py/data-syncmaster
-.. |Docker image| image:: https://img.shields.io/docker/v/mtsrus/syncmaster-server?sort=semver&label=docker
-    :target: https://hub.docker.com/r/mtsrus/syncmaster-server
 .. |Documentation| image:: https://readthedocs.org/projects/syncmaster/badge/?version=stable
     :target: https://syncmaster.readthedocs.io
 .. |Build Status| image:: https://github.com/MobileTeleSystems/syncmaster/workflows/Run%20All%20Tests/badge.svg

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "data-syncmaster"
-version = "0.2.0"
+version = "0.2.2"
 license = "Apache-2.0"
 description = "Syncmaster REST API + Worker"
 authors = ["DataOps.ETL <onetools@mts.ru>"]
@@ -18,10 +18,6 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -29,7 +25,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Typing :: Typed",
 ]
-keywords = ["Syncmaster", "REST", "API", "Worker", "Replication"]
+keywords = ["Syncmaster", "REST", "API", "Worker", "Spark", "Transfer", "ETL"]
 
 packages = [
     { include = "syncmaster" },

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/__init__.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
-_raw_version = "0.2.0"
+_raw_version = "0.2.2"
 # version always contain only release number like 0.0.1
 __version__ = ".".join(_raw_version.split(".")[:3])  # noqa: WPS410

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/migrations/versions/2023-11-23_0002_create_group_table.py

@@ -22,7 +22,7 @@ def upgrade():
     op.create_table(
         "group",
         sa.Column("id", sa.BigInteger(), nullable=False),
-        sa.Column("name", sa.String(length=256), nullable=False),
+        sa.Column("name", sa.String(length=128), nullable=False),
         sa.Column("description", sa.String(length=512), nullable=False),
         sa.Column("owner_id", sa.BigInteger(), nullable=False),
         sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/migrations/versions/2023-11-23_0004_create_connection_table.py

@@ -30,7 +30,7 @@ def upgrade():
         "connection",
         sa.Column("id", sa.BigInteger(), nullable=False),
         sa.Column("group_id", sa.BigInteger(), nullable=False),
-        sa.Column("type", sa.String(length=23), nullable=False),
+        sa.Column("type", sa.String(length=32), nullable=False),
         sa.Column("name", sa.String(length=128), nullable=False),
         sa.Column("description", sa.String(length=512), nullable=False),
         sa.Column("data", sa.JSON(), nullable=False),

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/models/connection.py

@@ -32,7 +32,7 @@ class ConnectionType(StrEnum):
 
 
 class Connection(Base, ResourceMixin, TimestampMixin):
-    type: Mapped[ConnectionType] = mapped_column(ChoiceType(ConnectionType, impl=String(23)), nullable=False)
+    type: Mapped[ConnectionType] = mapped_column(ChoiceType(ConnectionType, impl=String(32)), nullable=False)
     data: Mapped[dict[str, Any]] = mapped_column(JSON, nullable=False, default={})
 
     group: Mapped[Group] = relationship("Group")

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/models/group.py

@@ -71,7 +71,7 @@ class GroupMemberRole(enum.StrEnum):
 
 class Group(Base, TimestampMixin):
     id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
-    name: Mapped[str] = mapped_column(String(256), nullable=False, unique=True)
+    name: Mapped[str] = mapped_column(String(128), nullable=False, unique=True)
     description: Mapped[str] = mapped_column(String(512), nullable=False, default="")
     owner_id: Mapped[int] = mapped_column(ForeignKey("user.id", ondelete="CASCADE"), nullable=False, index=True)
 

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/repositories/group.py

@@ -15,7 +15,6 @@ from syncmaster.exceptions import EntityNotFoundError, SyncmasterError
 from syncmaster.exceptions.group import (
     AlreadyIsGroupMemberError,
     AlreadyIsNotGroupMemberError,
-    GroupAdminNotFoundError,
     GroupAlreadyExistsError,
     GroupNotFoundError,
 )
@@ -364,7 +363,7 @@ class GroupRepository(Repository[Group]):
         constraint = err.__cause__.__cause__.constraint_name
 
         if constraint == "fk__group__owner_id__user":
-            raise GroupAdminNotFoundError from err
+            raise UserNotFoundError from err
 
         if constraint == "uq__group__name":
             raise GroupAlreadyExistsError from err

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/db/repositories/queue.py

@@ -73,10 +73,10 @@ class QueueRepository(RepositoryWithOwner[Queue]):
         queue_data: UpdateQueueSchema,
     ) -> Queue:
         try:
-            queue = await self.read_by_id(queue_id=queue_id)
             return await self._update(
                 Queue.id == queue_id,
-                description=queue_data.description or queue.description,
+                name=queue_data.name,
+                description=queue_data.description,
             )
         except IntegrityError as e:
             self._raise_error(e)

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/exceptions/group.py

@@ -7,10 +7,6 @@ class GroupNameAlreadyExistsError(SyncmasterError):
     pass
 
 
-class GroupAdminNotFoundError(SyncmasterError):
-    pass
-
-
 class GroupAlreadyExistsError(SyncmasterError):
     pass
 

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/__init__.py

@@ -55,7 +55,6 @@ from syncmaster.schemas.v1.users import (
     FullUserSchema,
     ReadGroupMember,
     ReadUserSchema,
-    UpdateUserSchema,
     UserPageSchema,
     UserPageSchemaAsGroupMember,
 )
@@ -100,7 +99,6 @@ __all__ = [
     "JSONLine",
     "Parquet",
     "ReadUserSchema",
-    "UpdateUserSchema",
     "FullUserSchema",
     "ReadGroupMember",
     "UserPageSchema",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/clickhouse.py

@@ -29,7 +29,7 @@ class ReadClickhouseConnectionDataSchema(BaseModel):
 
 
 class CreateClickhouseConnectionSchema(CreateConnectionBaseSchema):
-    type: CLICKHOUSE_TYPE = Field(..., description="Connection type")
+    type: CLICKHOUSE_TYPE = Field(description="Connection type")
     data: CreateClickhouseConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/connection.py

@@ -125,7 +125,7 @@ UpdateConnectionSchema = Annotated[
 
 class ConnectionCopySchema(BaseModel):
     new_group_id: int
-    new_name: NameConstr | None = None  # noqa: F722
+    new_name: NameConstr | None = None
     remove_source: bool = False
 
 

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/connection_base.py

@@ -10,9 +10,9 @@ ReadConnectionAuthDataSchema = ReadBasicAuthSchema | ReadS3AuthSchema | ReadSamb
 
 
 class CreateConnectionBaseSchema(BaseModel):
-    group_id: int = Field(..., description="Connection owner group id")
-    name: NameConstr = Field(..., description="Connection name")  # noqa: F722
-    description: str = Field(..., description="Additional description")
+    group_id: int = Field(description="Connection owner group id")
+    name: NameConstr = Field(description="Connection name")
+    description: str = Field(description="Additional description")
 
     model_config = ConfigDict(populate_by_name=True)
 

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/ftp.py

@@ -26,7 +26,7 @@ class ReadFTPConnectionDataSchema(BaseModel):
 
 
 class CreateFTPConnectionSchema(CreateConnectionBaseSchema):
-    type: FTP_TYPE = Field(..., description="Connection type")
+    type: FTP_TYPE = Field(description="Connection type")
     data: CreateFTPConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/ftps.py

@@ -26,7 +26,7 @@ class ReadFTPSConnectionDataSchema(BaseModel):
 
 
 class CreateFTPSConnectionSchema(CreateConnectionBaseSchema):
-    type: FTPS_TYPE = Field(..., description="Connection type")
+    type: FTPS_TYPE = Field(description="Connection type")
     data: CreateFTPSConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/hdfs.py

@@ -24,7 +24,7 @@ class ReadHDFSConnectionDataSchema(BaseModel):
 
 
 class CreateHDFSConnectionSchema(CreateConnectionBaseSchema):
-    type: HDFS_TYPE = Field(..., description="Connection type")
+    type: HDFS_TYPE = Field(description="Connection type")
     data: CreateHDFSConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/hive.py

@@ -24,7 +24,7 @@ class ReadHiveConnectionDataSchema(BaseModel):
 
 
 class CreateHiveConnectionSchema(CreateConnectionBaseSchema):
-    type: HIVE_TYPE = Field(..., description="Connection type")
+    type: HIVE_TYPE = Field(description="Connection type")
     data: CreateHiveConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/mssql.py

@@ -29,7 +29,7 @@ class ReadMSSQLConnectionDataSchema(BaseModel):
 
 
 class CreateMSSQLConnectionSchema(CreateConnectionBaseSchema):
-    type: MSSQL_TYPE = Field(..., description="Connection type")
+    type: MSSQL_TYPE = Field(description="Connection type")
     data: CreateMSSQLConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/mysql.py

@@ -29,7 +29,7 @@ class ReadMySQLConnectionDataSchema(BaseModel):
 
 
 class CreateMySQLConnectionSchema(CreateConnectionBaseSchema):
-    type: MYSQL_TYPE = Field(..., description="Connection type")
+    type: MYSQL_TYPE = Field(description="Connection type")
     data: CreateMySQLConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/oracle.py

@@ -39,7 +39,7 @@ class ReadOracleConnectionDataSchema(BaseModel):
 
 
 class CreateOracleConnectionSchema(CreateConnectionBaseSchema):
-    type: ORACLE_TYPE = Field(..., description="Connection type")
+    type: ORACLE_TYPE = Field(description="Connection type")
     data: CreateOracleConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/postgres.py

@@ -30,7 +30,7 @@ class ReadPostgresConnectionDataSchema(BaseModel):
 
 
 class CreatePostgresConnectionSchema(CreateConnectionBaseSchema):
-    type: POSTGRES_TYPE = Field(..., description="Connection type")
+    type: POSTGRES_TYPE = Field(description="Connection type")
     data: CreatePostgresConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/s3.py

@@ -46,7 +46,7 @@ class ReadS3ConnectionDataSchema(BaseModel):
 
 
 class CreateS3ConnectionSchema(CreateConnectionBaseSchema):
-    type: S3_TYPE = Field(..., description="Connection type")
+    type: S3_TYPE = Field(description="Connection type")
     data: CreateS3ConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/samba.py

@@ -33,7 +33,7 @@ class ReadSambaConnectionDataSchema(BaseModel):
 
 
 class CreateSambaConnectionSchema(CreateConnectionBaseSchema):
-    type: SAMBA_TYPE = Field(..., description="Connection type")
+    type: SAMBA_TYPE = Field(description="Connection type")
     data: CreateSambaConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/sftp.py

@@ -26,7 +26,7 @@ class ReadSFTPConnectionDataSchema(BaseModel):
 
 
 class CreateSFTPConnectionSchema(CreateConnectionBaseSchema):
-    type: SFTP_TYPE = Field(..., description="Connection type")
+    type: SFTP_TYPE = Field(description="Connection type")
     data: CreateSFTPConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/connections/webdav.py

@@ -30,7 +30,7 @@ class ReadWebDAVConnectionDataSchema(BaseModel):
 
 
 class CreateWebDAVConnectionSchema(CreateConnectionBaseSchema):
-    type: WEBDAV_TYPE = Field(..., description="Connection type")
+    type: WEBDAV_TYPE = Field(description="Connection type")
     data: CreateWebDAVConnectionDataSchema = Field(
         ...,
         alias="connection_data",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/groups.py

@@ -8,13 +8,13 @@ from syncmaster.schemas.v1.types import NameConstr
 
 
 class UpdateGroupSchema(BaseModel):
-    name: NameConstr  # noqa: F722
+    name: NameConstr
     description: str
     owner_id: int
 
 
 class CreateGroupSchema(BaseModel):
-    name: NameConstr  # noqa: F722
+    name: NameConstr
     description: str
 
 
@@ -40,7 +40,7 @@ class AddUserSchema(BaseModel):
 
 class ReadGroupSchema(BaseModel):
     id: int
-    name: NameConstr  # noqa: F722
+    name: str
     description: str
     owner_id: int
 

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/queue.py

@@ -1,22 +1,33 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from pydantic import BaseModel, ConfigDict, Field, computed_field, constr
+import re
+from typing import Annotated
+
+from pydantic import BaseModel, ConfigDict, Field, StringConstraints, computed_field
 
 from syncmaster.schemas.v1.page import PageSchema
 
+ALLOWED_PATTERN = re.compile(r"^[ -~]+$")
+RESTRICTED_PATTERN = re.compile(r"[^a-zA-Z0-9]+")
+
+QueueName = Annotated[
+    str,
+    StringConstraints(min_length=3, max_length=128, pattern=ALLOWED_PATTERN),  # noqa: WPS432
+]
+
 
 class CreateQueueSchema(BaseModel):
-    name: constr(max_length=128, pattern=r"^[-_a-zA-Z0-9]+$") = Field(  # noqa: F722, WPS432
-        ...,
+    name: QueueName = Field(
         description="Queue name that allows letters, numbers, dashes, and underscores",
     )
-    group_id: int = Field(..., description="Queue owner group id")
+    group_id: int = Field(description="Queue owner group id")
     description: str = Field(default="", description="Additional description")
 
     @computed_field
     @property
     def slug(self) -> str:
-        return f"{self.group_id}-{self.name}"
+        short_name = RESTRICTED_PATTERN.sub("_", self.name.lower()).strip("_")
+        return f"{self.group_id}-{short_name}"
 
 
 class ReadQueueSchema(BaseModel):
@@ -34,4 +45,5 @@ class QueuePageSchema(PageSchema):
 
 
 class UpdateQueueSchema(BaseModel):
-    description: str | None = None
+    name: QueueName
+    description: str = ""

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/transfers/__init__.py

@@ -142,9 +142,9 @@ TransformationSchema = DataframeRowsFilter | DataframeColumnsFilter | FileMetada
 class CopyTransferSchema(BaseModel):
     new_group_id: int
     new_queue_id: int
-    new_source_connection_name: NameConstr | None = None  # noqa: F722
-    new_target_connection_name: NameConstr | None = None  # noqa: F722
-    new_name: NameConstr | None = None  # noqa: F722
+    new_source_connection_name: NameConstr | None = None
+    new_target_connection_name: NameConstr | None = None
+    new_name: NameConstr | None = None
     remove_source: bool = False
 
 
@@ -176,14 +176,14 @@ class ReadTransferSchema(BaseModel):
 
 
 class CreateTransferSchema(BaseModel):
-    group_id: int = Field(..., description="Transfer owner group id")
-    source_connection_id: int = Field(..., description="id of the connection that will be the data source")
-    target_connection_id: int = Field(..., description="id of the connection that will be the data receiver")
-    name: NameConstr = Field(..., description="Transfer name")  # noqa: F722
-    description: str = Field(..., description="Additional description")
-    is_scheduled: bool = Field(..., description="Is the transfer on schedule")
-    queue_id: int = Field(..., description="id of the queue in which the transfer will be performed")
-    schedule: str | None = Field(None, description="Execution schedule in cron format")
+    group_id: int = Field(description="Transfer owner group id")
+    source_connection_id: int = Field(description="id of the connection that will be the data source")
+    target_connection_id: int = Field(description="id of the connection that will be the data receiver")
+    name: NameConstr = Field(description="Transfer name")
+    description: str = Field(description="Additional description")
+    is_scheduled: bool = Field(description="Is the transfer on schedule")
+    queue_id: int = Field(description="id of the queue in which the transfer will be performed")
+    schedule: str | None = Field(default=None, description="Execution schedule in cron format")
     source_params: CreateTransferSchemaSource = Field(
         ...,
         discriminator="type",

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/transfers/file/base.py

@@ -23,7 +23,7 @@ from syncmaster.schemas.v1.transfers.file_format import (
 # classes are identical but may change in the future
 class ReadFileTransferSource(BaseModel):
     directory_path: str
-    file_format: CSV | JSONLine | JSON | Excel | XML | ORC | Parquet = Field(..., discriminator="type")
+    file_format: CSV | JSONLine | JSON | Excel | XML | ORC | Parquet = Field(discriminator="type")
     options: dict[str, Any]
 
 
@@ -42,7 +42,7 @@ class ReadFileTransferTarget(BaseModel):
 # classes are identical but may change in the future
 class CreateFileTransferSource(BaseModel):
     directory_path: str
-    file_format: CSV | JSONLine | JSON | Excel | XML | ORC | Parquet = Field(..., discriminator="type")
+    file_format: CSV | JSONLine | JSON | Excel | XML | ORC | Parquet = Field(discriminator="type")
     options: dict[str, Any] = Field(default_factory=dict)
 
     model_config = ConfigDict(arbitrary_types_allowed=True)

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/transfers/transformations/dataframe_columns_filter.py

@@ -30,4 +30,4 @@ ColumnsFilter = IncludeFilter | RenameFilter | CastFilter
 
 class DataframeColumnsFilter(BaseModel):
     type: DATAFRAME_COLUMNS_FILTER
-    filters: list[Annotated[ColumnsFilter, Field(..., discriminator="type")]] = Field(default_factory=list)
+    filters: list[Annotated[ColumnsFilter, Field(discriminator="type")]] = Field(default_factory=list)

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/transfers/transformations/dataframe_rows_filter.py

@@ -93,4 +93,4 @@ RowsFilter = (
 
 class DataframeRowsFilter(BaseModel):
     type: DATAFRAME_ROWS_FILTER
-    filters: list[Annotated[RowsFilter, Field(..., discriminator="type")]] = Field(default_factory=list)
+    filters: list[Annotated[RowsFilter, Field(discriminator="type")]] = Field(default_factory=list)

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/transfers/transformations/file_metadata_filter.py

@@ -50,4 +50,4 @@ MetadataFilter = NameGlobFilter | NameRegexpFilter | FileSizeMinFilter | FileSiz
 
 class FileMetadataFilter(BaseModel):
     type: FILE_METADATA_FILTER
-    filters: list[Annotated[MetadataFilter, Field(..., discriminator="type")]] = Field(default_factory=list)
+    filters: list[Annotated[MetadataFilter, Field(discriminator="type")]] = Field(default_factory=list)

data_syncmaster-0.2.2/syncmaster/schemas/v1/types.py

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-License-Identifier: Apache-2.0
+from typing import Annotated
+
+from pydantic import StringConstraints
+
+NameConstr = Annotated[str, StringConstraints(min_length=3, max_length=128)]  # noqa: WPS432

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/schemas/v1/users.py

@@ -1,16 +1,12 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from pydantic import BaseModel, ConfigDict, constr
+from pydantic import BaseModel, ConfigDict
 
 from syncmaster.db.models import GroupMemberRole
 from syncmaster.db.utils import Pagination
 from syncmaster.schemas.v1.page import MetaPageSchema, PageSchema
 
 
-class UpdateUserSchema(BaseModel):
-    username: constr(pattern=r"^[_a-z0-9]+$")  # noqa: F722
-
-
 class ReadGroupMember(BaseModel):
     id: int
     username: str

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/server/__init__.py

@@ -6,6 +6,7 @@ from fastapi.exceptions import RequestValidationError
 from pydantic import ValidationError
 from sqlalchemy.ext.asyncio import async_engine_from_config
 
+from syncmaster import _raw_version as syncmaster_version
 from syncmaster.db.factory import create_session_factory, get_uow
 from syncmaster.exceptions import SyncmasterError
 from syncmaster.server.api.router import api_router
@@ -34,7 +35,8 @@ def celery_factory(settings: Settings) -> Celery:
 
 def application_factory(settings: Settings) -> FastAPI:
     application = FastAPI(
-        title="Syncmaster",
+        title="SyncMaster",
+        version=syncmaster_version,
         debug=settings.server.debug,
         # will be set up by middlewares
         openapi_url=None,

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/server/api/v1/groups.py

@@ -92,7 +92,7 @@ async def read_group(
     )
 
 
-@router.patch("/groups/{group_id}")
+@router.put("/groups/{group_id}")
 async def update_group(  # noqa: WPS217
     group_id: int,
     group_data: UpdateGroupSchema,
@@ -173,7 +173,7 @@ async def read_group_users(
     return UserPageSchemaAsGroupMember.from_pagination(pagination=pagination)
 
 
-@router.patch("/groups/{group_id}/users/{user_id}")
+@router.put("/groups/{group_id}/users/{user_id}")
 async def update_user_role_group(
     group_id: int,
     user_id: int,

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/server/api/v1/queue.py

@@ -94,7 +94,7 @@ async def create_queue(
     return ReadQueueSchema.model_validate(queue, from_attributes=True)
 
 
-@router.patch("/queues/{queue_id}", description="Updating queue information")
+@router.put("/queues/{queue_id}", description="Updating queue information")
 async def update_queue(
     queue_id: int,
     queue_data: UpdateQueueSchema,

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/server/handler.py

@@ -25,7 +25,6 @@ from syncmaster.exceptions.group import (
     AlreadyIsGroupMemberError,
     AlreadyIsGroupOwnerError,
     AlreadyIsNotGroupMemberError,
-    GroupAdminNotFoundError,
     GroupAlreadyExistsError,
     GroupNotFoundError,
 )
@@ -165,13 +164,6 @@ async def syncmsater_exception_handler(request: Request, exc: SyncmasterError):
             content=content,
         )
 
-    if isinstance(exc, GroupAdminNotFoundError):
-        content.code = "not_found"
-        content.message = "Admin not found"
-        return exception_json_response(
-            status=status.HTTP_404_NOT_FOUND,
-            content=content,
-        )
     if isinstance(exc, GroupAlreadyExistsError):
         content.code = "conflict"
         content.message = "Group name already taken"

{data_syncmaster-0.2.0 → data_syncmaster-0.2.2}/syncmaster/server/middlewares/static_files.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 from fastapi import FastAPI
+from starlette.staticfiles import StaticFiles
 
 from syncmaster.server.settings.server.static_files import StaticFilesSettings
 
@@ -11,5 +12,5 @@ def apply_static_files(app: FastAPI, settings: StaticFilesSettings) -> FastAPI:
         return app
 
     # https://fastapi.tiangolo.com/how-to/custom-docs-ui-assets/#serve-the-static-files
-    # app.mount("/static", StaticFiles(directory=settings.directory), name="static")
+    app.mount("/static", StaticFiles(directory=settings.directory), name="static")
     return app