Merge pull request #15 from signnow/feat/document-group-template-improvements

Feat/document group template improvements

Author: mihasicehcek

examples/langchain/langchain_example.py

@@ -14,18 +14,16 @@ async def main() -> None:
         os.environ.update(dotenv_values(env_path))
 
     # MCP server as subprocess (example: your sn-mcp serve)
-    client = MultiServerMCPClient(
-        {
-            "sn": {
-                "transport": "stdio",
-                "command": "sn-mcp",
-                "args": ["serve"],
-                # "cwd": "/path/to/dir",
-                # "env": {"VAR": "value"},
-                # "allowed_tools": ["list_templates", "get_template"],
-            }
+    client = MultiServerMCPClient({
+        "sn": {
+            "transport": "stdio",
+            "command": "sn-mcp",
+            "args": ["serve"],
+            # "cwd": "/path/to/dir",
+            # "env": {"VAR": "value"},
+            # "allowed_tools": ["list_templates", "get_template"],
         }
-    )
+    })
 
     tools = await client.get_tools()  # MCP → LangChain tools
 
@@ -36,13 +34,11 @@ async def main() -> None:
         temperature=0,
     )
 
-    prompt = ChatPromptTemplate.from_messages(
-        [
-            ("system", "Be helpful."),
-            ("human", "{input}"),
-            MessagesPlaceholder("agent_scratchpad"),
-        ]
-    )
+    prompt = ChatPromptTemplate.from_messages([
+        ("system", "Be helpful."),
+        ("human", "{input}"),
+        MessagesPlaceholder("agent_scratchpad"),
+    ])
     agent = create_openai_tools_agent(llm, tools, prompt)
     execu = AgentExecutor(agent=agent, tools=tools, verbose=True)
 

src/signnow_client/models/document_groups.py

@@ -6,6 +6,8 @@
 
 from typing import Any
 
+from typing_extensions import Self
+
 from pydantic import BaseModel, EmailStr, Field, HttpUrl
 
 
@@ -32,7 +34,7 @@ class DocumentGroupDocument(BaseModel):
     """Document information within a document group."""
 
     id: str = Field(..., description="Document ID")
-    document_name: str = Field(..., description="Document name")
+    document_name: str | None = Field(None, description="Document name")
     thumbnail: dict[str, str] = Field(..., description="Document thumbnails")
     roles: list[str] = Field(..., description="Roles defined for this document")
 
@@ -150,7 +152,7 @@ class DocumentGroupTemplateRecipientAttributes(BaseModel):
     decline_redirect_uri: str | None = Field(None, description="URL after recipient declines document")
     close_redirect_uri: str | None = Field(None, description="URL after save progress or close")
 
-    def model_dump(self, **kwargs: Any) -> dict[str, Any]:
+    def model_dump(self: Self, **kwargs: Any) -> dict[str, Any]:  # noqa: ANN401
         """Override model_dump to exclude redirect_target if redirect_uri is not provided."""
         data = super().model_dump(**kwargs)
         if (not self.redirect_uri or not self.redirect_uri.strip()) and "redirect_target" in data:
@@ -213,7 +215,7 @@ class CreateDocumentGroupEmbeddedEditorRequest(BaseModel):
     link_expiration: int | None = Field(15, description="Link expiration in minutes (default: 15, max: 43200 for Admin users)")
     redirect_target: str | None = Field("self", description="Redirect target: 'blank' (new tab) or 'self' (same tab)")
 
-    def model_dump(self, **kwargs: Any) -> dict[str, Any]:
+    def model_dump(self: Self, **kwargs: Any) -> dict[str, Any]:  # noqa: ANN401
         """Override model_dump to exclude redirect_target if redirect_uri is not provided."""
         data = super().model_dump(**kwargs)
         if (not self.redirect_uri or not self.redirect_uri.strip()) and "redirect_target" in data:
@@ -229,7 +231,7 @@ class CreateDocumentGroupEmbeddedSendingRequest(BaseModel):
     link_expiration: int | None = Field(15, description="Link expiration in minutes (15-45, max: 43200 for Admin users)")
     type: str | None = Field("manage", description="Sending step: 'manage' (Add documents), 'edit' (editor), 'send-invite' (Send Invite page)")
 
-    def model_dump(self, **kwargs: Any) -> dict[str, Any]:
+    def model_dump(self: Self, **kwargs: Any) -> dict[str, Any]:  # noqa: ANN401
         """Override model_dump to exclude redirect_target if redirect_uri is not provided."""
         data = super().model_dump(**kwargs)
         if (not self.redirect_uri or not self.redirect_uri.strip()) and "redirect_target" in data:

src/sn_mcp_server/_version.py

@@ -28,7 +28,7 @@
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.5.dev21+gb89924ba2.d20251104'
-__version_tuple__ = version_tuple = (0, 1, 5, 'dev21', 'gb89924ba2.d20251104')
+__version__ = version = "0.1.5.dev24+g1d96ac78f.d20251104"
+__version_tuple__ = version_tuple = (0, 1, 5, "dev24", "g1d96ac78f.d20251104")
 
 __commit_id__ = commit_id = None

src/sn_mcp_server/auth.py

@@ -70,20 +70,18 @@ def _verify_jwt(token: str) -> dict[str, Any] | None:
 
 # ============= OAuth endpoints =============
 async def openid_config(_: Request) -> JSONResponse:
-    return JSONResponse(
-        {
-            "issuer": str(settings.oauth_issuer),
-            "authorization_endpoint": f"{str(settings.oauth_issuer)}authorize",
-            "token_endpoint": f"{str(settings.oauth_issuer)}oauth2/token",
-            "jwks_uri": f"{str(settings.oauth_issuer)}.well-known/jwks.json",
-            "registration_endpoint": f"{str(settings.oauth_issuer)}oauth2/register",
-            "scopes_supported": ["openid", "profile", "offline_access", "*"],
-            "response_types_supported": ["code"],
-            "grant_types_supported": ["authorization_code", "refresh_token"],
-            "code_challenge_methods_supported": ["S256"],
-            "token_endpoint_auth_methods_supported": ["none", "client_secret_post"],
-        }
-    )
+    return JSONResponse({
+        "issuer": str(settings.oauth_issuer),
+        "authorization_endpoint": f"{str(settings.oauth_issuer)}authorize",
+        "token_endpoint": f"{str(settings.oauth_issuer)}oauth2/token",
+        "jwks_uri": f"{str(settings.oauth_issuer)}.well-known/jwks.json",
+        "registration_endpoint": f"{str(settings.oauth_issuer)}oauth2/register",
+        "scopes_supported": ["openid", "profile", "offline_access", "*"],
+        "response_types_supported": ["code"],
+        "grant_types_supported": ["authorization_code", "refresh_token"],
+        "code_challenge_methods_supported": ["S256"],
+        "token_endpoint_auth_methods_supported": ["none", "client_secret_post"],
+    })
 
 
 async def oauth_as_meta(_: Request) -> JSONResponse:
@@ -134,15 +132,13 @@ async def token(req: Request) -> JSONResponse:
             return JSONResponse({"error": "external_token_error"}, status_code=500)
 
         # Return tokens from SignNow API
-        return JSONResponse(
-            {
-                "token_type": signnow_response.get("token_type", "Bearer"),
-                "access_token": signnow_response.get("access_token"),
-                "expires_in": signnow_response.get("expires_in", settings.access_ttl),
-                "refresh_token": signnow_response.get("refresh_token"),
-                "scope": "*",
-            }
-        )
+        return JSONResponse({
+            "token_type": signnow_response.get("token_type", "Bearer"),
+            "access_token": signnow_response.get("access_token"),
+            "expires_in": signnow_response.get("expires_in", settings.access_ttl),
+            "refresh_token": signnow_response.get("refresh_token"),
+            "scope": "*",
+        })
 
     elif grant_type == "refresh_token":
         refresh = form.get("refresh_token")
@@ -159,15 +155,13 @@ async def token(req: Request) -> JSONResponse:
             return JSONResponse({"error": "invalid_request", "error_description": "refresh_token must be a string"}, status_code=400)
 
         if signnow_response:
-            return JSONResponse(
-                {
-                    "token_type": signnow_response.get("token_type", "Bearer"),
-                    "access_token": signnow_response.get("access_token"),
-                    "expires_in": signnow_response.get("expires_in", settings.access_ttl),
-                    "refresh_token": signnow_response.get("refresh_token"),
-                    "scope": signnow_response.get("scope", "*"),
-                }
-            )
+            return JSONResponse({
+                "token_type": signnow_response.get("token_type", "Bearer"),
+                "access_token": signnow_response.get("access_token"),
+                "expires_in": signnow_response.get("expires_in", settings.access_ttl),
+                "refresh_token": signnow_response.get("refresh_token"),
+                "scope": signnow_response.get("scope", "*"),
+            })
         else:
             return JSONResponse({"error": "invalid_grant"}, status_code=400)
 
@@ -185,17 +179,15 @@ async def introspect(req: Request) -> JSONResponse:
     active = claims is not None
     resp: dict[str, Any] = {"active": bool(active)}
     if active and claims:
-        resp.update(
-            {
-                "iss": claims["iss"],
-                "sub": claims["sub"],
-                "aud": claims["aud"],
-                "client_id": claims.get("client_id"),
-                "scope": claims.get("scope", ""),
-                "exp": claims["exp"],
-                "iat": claims["iat"],
-            }
-        )
+        resp.update({
+            "iss": claims["iss"],
+            "sub": claims["sub"],
+            "aud": claims["aud"],
+            "client_id": claims.get("client_id"),
+            "scope": claims.get("scope", ""),
+            "exp": claims["exp"],
+            "iat": claims["iat"],
+        })
     return JSONResponse(resp)
 
 
@@ -220,14 +212,12 @@ async def revoke(req: Request) -> PlainTextResponse | JSONResponse:
 
 # ============= PRM (Protected Resource Metadata) =============
 def prm_for_resource(resource_url: str) -> JSONResponse:
-    return JSONResponse(
-        {
-            "resource": resource_url,
-            "authorization_servers": [str(settings.oauth_issuer)],
-            "bearer_methods_supported": ["header"],
-            "scopes_supported": ["openid", "profile", "offline_access", "*"],
-        }
-    )
+    return JSONResponse({
+        "resource": resource_url,
+        "authorization_servers": [str(settings.oauth_issuer)],
+        "bearer_methods_supported": ["header"],
+        "scopes_supported": ["openid", "profile", "offline_access", "*"],
+    })
 
 
 async def prm_root(_: Request) -> JSONResponse:
@@ -317,16 +307,14 @@ async def __call__(self, scope: dict[str, Any], receive: Any, send: Any) -> None
             if not self.token_provider.has_config_credentials():
                 token = self.token_provider.get_access_token(dict(request.headers))
                 if not token:
-                    await send(
-                        {
-                            "type": "http.response.start",
-                            "status": 401,
-                            "headers": [
-                                (b"www-authenticate", f'Bearer resource_metadata="{str(settings.oauth_issuer)}/.well-known/oauth-protected-resource"'.encode()),
-                                (b"content-type", b"text/plain; charset=utf-8"),
-                            ],
-                        }
-                    )
+                    await send({
+                        "type": "http.response.start",
+                        "status": 401,
+                        "headers": [
+                            (b"www-authenticate", f'Bearer resource_metadata="{str(settings.oauth_issuer)}/.well-known/oauth-protected-resource"'.encode()),
+                            (b"content-type", b"text/plain; charset=utf-8"),
+                        ],
+                    })
                     await send({"type": "http.response.body", "body": b"Unauthorized"})
                     return
 

src/sn_mcp_server/cli.py

@@ -4,6 +4,7 @@
 import typer
 import uvicorn
 
+from ._version import __version__
 from .server import create_server
 
 app = typer.Typer(help="SignNow MCP server")
@@ -15,13 +16,15 @@
 def serve() -> None:
     """Run MCP server in standalone mode"""
     logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+    print(f"SignNow MCP Server v{__version__}", file=sys.stderr)
     mcp = create_server()
     mcp.run()
 
 
 @app.command()
-def http(host: str = "0.0.0.0", port: int = 8000, reload: bool = False) -> None:
+def http(host: str = "0.0.0.0", port: int = 8000, reload: bool = False) -> None:  # noqa: S104
     """Run HTTP server with MCP endpoints"""
+    print(f"SignNow MCP Server v{__version__}", file=sys.stderr)
     uvicorn.run("sn_mcp_server.app:create_http_app", factory=True, host=host, port=port, reload=reload)
 
 

src/sn_mcp_server/tools/list_documents.py

@@ -5,9 +5,8 @@
 from the SignNow API and converting them to simplified formats for MCP tools.
 """
 
-from typing import Any
-
 from signnow_client import SignNowAPIClient
+from signnow_client.config import SignNowConfig
 
 from .models import (
     SimplifiedDocumentGroup,
@@ -16,7 +15,7 @@
 )
 
 
-def _list_document_groups(token: str, signnow_config: Any, limit: int = 50, offset: int = 0) -> SimplifiedDocumentGroupsResponse:
+def _list_document_groups(token: str, signnow_config: SignNowConfig, limit: int = 50, offset: int = 0) -> SimplifiedDocumentGroupsResponse:
     """Provide simplified list of document groups with basic fields.
 
     Args:
@@ -37,7 +36,9 @@ def _list_document_groups(token: str, signnow_config: Any, limit: int = 50, offs
     for group in full_response.document_groups:
         simplified_docs = []
         for doc in group.documents:
-            simplified_doc = SimplifiedDocumentGroupDocument(id=doc.id, name=doc.document_name, roles=doc.roles)
+            # Use document_name if available, otherwise fallback to document ID
+            document_name = doc.document_name if doc.document_name is not None else doc.id
+            simplified_doc = SimplifiedDocumentGroupDocument(id=doc.id, name=document_name, roles=doc.roles)
             simplified_docs.append(simplified_doc)
 
         simplified_group = SimplifiedDocumentGroup(

src/sn_mcp_server/tools/models.py

@@ -93,7 +93,7 @@ class InviteRecipient(BaseModel):
     role: str = Field(..., description="Recipient's role name in the document")
     message: str | None = Field(None, description="Custom email message for the recipient")
     subject: str | None = Field(None, description="Custom email subject for the recipient")
-    action: str = Field(default='sign', description="Allowed action with a document. Possible values: 'view', 'sign', 'approve'")
+    action: str = Field(default="sign", description="Allowed action with a document. Possible values: 'view', 'sign', 'approve'")
     redirect_uri: str | None = Field(None, description="Link that opens after completion")
     redirect_target: str | None = Field("blank", description="Redirect target: 'blank' for new tab, 'self' for same tab")
     decline_redirect_uri: str | None = Field(None, description="URL that opens after decline")
@@ -127,7 +127,7 @@ class EmbeddedInviteRecipient(BaseModel):
 
     email: str = Field(..., description="Recipient's email address")
     role: str = Field(..., description="Recipient's role name in the document")
-    action: str = Field(default='sign', description="Allowed action with a document. Possible values: 'view', 'sign', 'approve'")
+    action: str = Field(default="sign", description="Allowed action with a document. Possible values: 'view', 'sign', 'approve'")
     auth_method: str = Field("none", description="Authentication method in integrated app: 'password', 'email', 'mfa', 'biometric', 'social', 'other', 'none'")
     first_name: str | None = Field(None, description="Recipient's first name")
     last_name: str | None = Field(None, description="Recipient's last name")