Merge pull request #10 from signnow/feat/docker-build-and-config-oneof

feat: add version file and update config with OneOf validation

Author: mihasicehcek

pyproject.toml

@@ -79,3 +79,4 @@ packages = [
   "src/sn_mcp_server",
   "src/signnow_client",
 ]
+sources = ["src"]

src/signnow_client/config.py

@@ -36,70 +36,70 @@ class SignNowConfig(BaseSettings):
 
     @field_validator("api_base", mode="before")
     @classmethod
-    def validate_api_base(cls, v):
+    def validate_api_base(cls: type["SignNowConfig"], v: str | None) -> AnyHttpUrl:
         """Handle empty string for api_base"""
         if v == "" or v is None:
             return AnyHttpUrl("https://api.signnow.com")
         return v
 
     @field_validator("app_base", mode="before")
     @classmethod
-    def validate_app_base(cls, v):
+    def validate_app_base(cls: type["SignNowConfig"], v: str | None) -> AnyHttpUrl:
         """Handle empty string for app_base"""
         if v == "" or v is None:
             return AnyHttpUrl("https://app.signnow.com")
         return v
 
     @field_validator("client_id", mode="before")
     @classmethod
-    def validate_client_id(cls, v):
+    def validate_client_id(cls: type["SignNowConfig"], v: str | None) -> str | None:
         """Handle empty string for client_id"""
         if v == "":
             return None
         return v
 
     @field_validator("client_secret", mode="before")
     @classmethod
-    def validate_client_secret(cls, v):
+    def validate_client_secret(cls: type["SignNowConfig"], v: str | None) -> str | None:
         """Handle empty string for client_secret"""
         if v == "":
             return None
         return v
 
     @field_validator("basic_token", mode="before")
     @classmethod
-    def validate_basic_token(cls, v):
+    def validate_basic_token(cls: type["SignNowConfig"], v: str | None) -> str | None:
         """Handle empty string for basic_token"""
         if v == "":
             return None
         return v
 
     @field_validator("user_email", mode="before")
     @classmethod
-    def validate_user_email(cls, v):
+    def validate_user_email(cls: type["SignNowConfig"], v: str | None) -> str | None:
         """Handle empty string for user_email"""
         if v == "":
             return None
         return v
 
     @field_validator("password", mode="before")
     @classmethod
-    def validate_password(cls, v):
+    def validate_password(cls: type["SignNowConfig"], v: str | None) -> str | None:
         """Handle empty string for password"""
         if v == "":
             return None
         return v
 
     @field_validator("default_scope", mode="before")
     @classmethod
-    def validate_default_scope(cls, v):
+    def validate_default_scope(cls: type["SignNowConfig"], v: str | None) -> str:
         """Handle empty string for default_scope"""
         if v == "" or v is None:
             return "*"
         return v
 
     @model_validator(mode="after")
-    def validate_one_of_credentials(self) -> "SignNowConfig":
+    def validate_one_of_credentials(self: "SignNowConfig") -> "SignNowConfig":
         """Ensure that either password grant set or client credentials set is fully provided.
 
         Option A (password grant): SIGNNOW_USER_EMAIL, SIGNNOW_PASSWORD, SIGNNOW_API_BASIC_TOKEN

src/sn_mcp_server/_version.py

@@ -0,0 +1,33 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Union
+
+    VERSION_TUPLE = tuple[int | str, ...]
+    COMMIT_ID = str | None
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = "0.1.5.dev16+g4f99697d7.d20251007"
+__version_tuple__ = version_tuple = (0, 1, 5, "dev16", "g4f99697d7.d20251007")
+
+__commit_id__ = commit_id = None

src/sn_mcp_server/config.py

@@ -23,31 +23,31 @@ class Settings(BaseSettings):
 
     @field_validator("oauth_issuer", mode="before")
     @classmethod
-    def validate_oauth_issuer(cls, v):
+    def validate_oauth_issuer(cls: type["Settings"], v: str | None) -> AnyHttpUrl:
         """Handle empty string for oauth_issuer"""
         if v == "" or v is None:
             return AnyHttpUrl("http://localhost:8000")
         return v
 
     @field_validator("access_ttl", mode="before")
     @classmethod
-    def validate_access_ttl(cls, v):
+    def validate_access_ttl(cls: type["Settings"], v: str | None) -> int:
         """Handle empty string for access_ttl"""
         if v == "" or v is None:
             return 3600
         return v
 
     @field_validator("refresh_ttl", mode="before")
     @classmethod
-    def validate_refresh_ttl(cls, v):
+    def validate_refresh_ttl(cls: type["Settings"], v: str | None) -> int:
         """Handle empty string for refresh_ttl"""
         if v == "" or v is None:
             return 2592000
         return v
 
     @field_validator("allowed_redirects")
     @classmethod
-    def validate_redirects(cls, v: str) -> str:
+    def validate_redirects(cls: type["Settings"], v: str) -> str:
         """Validate that all redirect URIs are valid"""
         if not v:
             return v
@@ -57,29 +57,29 @@ def validate_redirects(cls, v: str) -> str:
             try:
                 AnyHttpUrl(uri)
             except ValueError as e:
-                raise ValueError(f"Invalid redirect URI '{uri}': {e}")
+                raise ValueError(f"Invalid redirect URI '{uri}': {e}") from e
         return v
 
     @property
-    def allowed_redirects_list(self) -> list[str]:
+    def allowed_redirects_list(self: "Settings") -> list[str]:
         """Convert comma-separated redirects string to list"""
         return [uri.strip() for uri in self.allowed_redirects.split(",") if uri.strip()]
 
     @property
-    def effective_resource_http_url(self) -> str:
+    def effective_resource_http_url(self: "Settings") -> str:
         """Get resource HTTP URL, auto-generated from oauth_issuer"""
         if not self.oauth_issuer:
             raise ValueError("OAUTH_ISSUER is required to generate resource URLs")
         return f"{str(self.oauth_issuer).rstrip('/')}/mcp"
 
     @property
-    def effective_resource_sse_url(self) -> str:
+    def effective_resource_sse_url(self: "Settings") -> str:
         """Get resource SSE URL, auto-generated from oauth_issuer"""
         if not self.oauth_issuer:
             raise ValueError("OAUTH_ISSUER is required to generate resource URLs")
         return f"{str(self.oauth_issuer).rstrip('/')}/sse"
 
-    def get_rsa_private_key(self) -> rsa.RSAPrivateKey:
+    def get_rsa_private_key(self: "Settings") -> rsa.RSAPrivateKey:
         """Get RSA private key - either from config or generate new one"""
         if self.oauth_rsa_private_pem:
             try: