nextcloud-agent 0.2.26__tar.gz → 0.2.28__tar.gz

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextcloud-agent
-Version: 0.2.26
+Version: 0.2.28
 Summary: Nextcloud MCP Server for Agentic AI!
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: agent-utilities[agent,logfire]>=0.2.12
+Requires-Dist: agent-utilities[agent,logfire]>=0.2.14
 Requires-Dist: python-dateutil>=2.8.2
 Requires-Dist: icalendar>=6.1.1
 Requires-Dist: vobject>=0.9.9
@@ -41,7 +41,7 @@ Dynamic: license-file
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/nextcloud-agent)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/nextcloud-agent)
 
-*Version: 0.2.26*
+*Version: 0.2.28*
 
 ## Overview
 

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/README.md

@@ -21,7 +21,7 @@
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/nextcloud-agent)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/nextcloud-agent)
 
-*Version: 0.2.26*
+*Version: 0.2.28*
 
 ## Overview
 

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/nextcloud_agent/agent/IDENTITY.md

@@ -7,9 +7,8 @@
 
  ### System Prompt
  You are the Nextcloud Agent.
- You must always first run list_skills and list_tools to discover available skills and tools.
- Your goal is to assist the user with Nextcloud operations using the `mcp-client` universal skill.
- Check the `mcp-client` reference documentation for `nextcloud-agent.md` to discover the exact tags and tools available for your capabilities.
+ You must always first run `list_skills` to show all skills.
+ Then, use the `mcp-client` universal skill and check the reference documentation for `nextcloud-agent.md` to discover the exact tags and tools available for your capabilities.
 
  ### Capabilities
  - **MCP Operations**: Leverage the `mcp-client` skill to interact with the target MCP server. Refer to `nextcloud-agent.md` for specific tool capabilities.

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/nextcloud_agent/agent.py

@@ -11,7 +11,7 @@ from agent_utilities import (
     load_identity,
 )
 
-__version__ = "0.2.26"
+__version__ = "0.2.28"
 
 logging.basicConfig(
     level=logging.INFO,

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/nextcloud_agent/mcp.py

@@ -9,31 +9,18 @@ import logging
 import json
 import uuid
 import dateutil.parser
-import requests
-from typing import List, Union, Dict
+from typing import Dict
 from pydantic import Field
-from eunomia_mcp.middleware import EunomiaMcpMiddleware
 from fastmcp import FastMCP, Context
-from fastmcp.server.auth.oidc_proxy import OIDCProxy
-from fastmcp.server.auth import OAuthProxy, RemoteAuthProvider
-from fastmcp.server.auth.providers.jwt import JWTVerifier, StaticTokenVerifier
-from fastmcp.server.middleware.logging import LoggingMiddleware
-from fastmcp.server.middleware.timing import TimingMiddleware
-from fastmcp.server.middleware.rate_limiting import RateLimitingMiddleware
-from fastmcp.server.middleware.error_handling import ErrorHandlingMiddleware
 from fastmcp.utilities.logging import get_logger
 from icalendar import Calendar, Event
 from agent_utilities.mcp_utilities import (
-    create_mcp_parser,
+    create_mcp_server,
     config,
 )
-from agent_utilities.middlewares import (
-    UserTokenMiddleware,
-    JWTClaimsLoggingMiddleware,
-)
 from nextcloud_agent.auth import get_client
 
-__version__ = "0.2.26"
+__version__ = "0.2.28"
 print(f"Nextcloud MCP v{__version__}")
 
 logger = get_logger(name="TokenMiddleware")
@@ -455,314 +442,14 @@ def register_contacts_tools(mcp: FastMCP):
 
 
 def mcp_server() -> None:
-    """Run the Nextcloud MCP server with specified transport and connection parameters.
-
-    This function parses command-line arguments to configure and start the MCP server for Nextcloud API interactions.
-    It supports stdio or TCP transport modes and exits on invalid arguments or help requests.
-    """
     load_dotenv(find_dotenv())
-    parser = create_mcp_parser()
-
-    args = parser.parse_args()
-
-    if hasattr(args, "help") and args.help:
-
-        parser.print_help()
 
-        sys.exit(0)
-
-    if args.port < 0 or args.port > 65535:
-        print(f"Error: Port {args.port} is out of valid range (0-65535).")
-        sys.exit(1)
-
-    config["enable_delegation"] = args.enable_delegation
-    config["audience"] = args.audience or config["audience"]
-    config["delegated_scopes"] = args.delegated_scopes or config["delegated_scopes"]
-    config["oidc_config_url"] = args.oidc_config_url or config["oidc_config_url"]
-    config["oidc_client_id"] = args.oidc_client_id or config["oidc_client_id"]
-    config["oidc_client_secret"] = (
-        args.oidc_client_secret or config["oidc_client_secret"]
+    args, mcp, middlewares = create_mcp_server(
+        name="Nextcloud",
+        version=__version__,
+        instructions="Nextcloud Agent MCP Server - Manage files, folders, shares, calendar events, and contacts.",
     )
 
-    if config["enable_delegation"]:
-        if args.auth_type != "oidc-proxy":
-            logger.error("Token delegation requires auth-type=oidc-proxy")
-            sys.exit(1)
-        if not config["audience"]:
-            logger.error("audience is required for delegation")
-            sys.exit(1)
-        if not all(
-            [
-                config["oidc_config_url"],
-                config["oidc_client_id"],
-                config["oidc_client_secret"],
-            ]
-        ):
-            logger.error(
-                "Delegation requires complete OIDC configuration (oidc-config-url, oidc-client-id, oidc-client-secret)"
-            )
-            sys.exit(1)
-
-        try:
-            logger.info(
-                "Fetching OIDC configuration",
-                extra={"oidc_config_url": config["oidc_config_url"]},
-            )
-            oidc_config_resp = requests.get(config["oidc_config_url"])
-            oidc_config_resp.raise_for_status()
-            oidc_config = oidc_config_resp.json()
-            config["token_endpoint"] = oidc_config.get("token_endpoint")
-            if not config["token_endpoint"]:
-                logger.error("No token_endpoint found in OIDC configuration")
-                raise ValueError("No token_endpoint found in OIDC configuration")
-            logger.info(
-                "OIDC configuration fetched successfully",
-                extra={"token_endpoint": config["token_endpoint"]},
-            )
-        except Exception as e:
-            print(f"Failed to fetch OIDC configuration: {e}")
-            logger.error(
-                "Failed to fetch OIDC configuration",
-                extra={"error_type": type(e).__name__, "error_message": str(e)},
-            )
-            sys.exit(1)
-
-    auth = None
-    allowed_uris = (
-        args.allowed_client_redirect_uris.split(",")
-        if args.allowed_client_redirect_uris
-        else None
-    )
-
-    if args.auth_type == "none":
-        auth = None
-    elif args.auth_type == "static":
-        auth = StaticTokenVerifier(
-            tokens={
-                "test-token": {"client_id": "test-user", "scopes": ["read", "write"]},
-                "admin-token": {"client_id": "admin", "scopes": ["admin"]},
-            }
-        )
-    elif args.auth_type == "jwt":
-        jwks_uri = args.token_jwks_uri or os.getenv("FASTMCP_SERVER_AUTH_JWT_JWKS_URI")
-        issuer = args.token_issuer or os.getenv("FASTMCP_SERVER_AUTH_JWT_ISSUER")
-        audience = args.token_audience or os.getenv("FASTMCP_SERVER_AUTH_JWT_AUDIENCE")
-        algorithm = args.token_algorithm
-        secret_or_key = args.token_secret or args.token_public_key
-        public_key_pem = None
-
-        if not (jwks_uri or secret_or_key):
-            logger.error(
-                "JWT auth requires either --token-jwks-uri or --token-secret/--token-public-key"
-            )
-            sys.exit(1)
-        if not (issuer and audience):
-            logger.error("JWT requires --token-issuer and --token-audience")
-            sys.exit(1)
-
-        if args.token_public_key and os.path.isfile(args.token_public_key):
-            try:
-                with open(args.token_public_key, "r") as f:
-                    public_key_pem = f.read()
-                logger.info(f"Loaded static public key from {args.token_public_key}")
-            except Exception as e:
-                print(f"Failed to read public key file: {e}")
-                logger.error(f"Failed to read public key file: {e}")
-                sys.exit(1)
-        elif args.token_public_key:
-            public_key_pem = args.token_public_key
-
-        if jwks_uri and (algorithm or secret_or_key):
-            logger.warning(
-                "JWKS mode ignores --token-algorithm and --token-secret/--token-public-key"
-            )
-
-        if algorithm and algorithm.startswith("HS"):
-            if not secret_or_key:
-                logger.error(f"HMAC algorithm {algorithm} requires --token-secret")
-                sys.exit(1)
-            if jwks_uri:
-                logger.error("Cannot use --token-jwks-uri with HMAC")
-                sys.exit(1)
-            public_key = secret_or_key
-        else:
-            public_key = public_key_pem
-
-        required_scopes = None
-        if args.required_scopes:
-            required_scopes = [
-                s.strip() for s in args.required_scopes.split(",") if s.strip()
-            ]
-
-        try:
-            auth = JWTVerifier(
-                jwks_uri=jwks_uri,
-                public_key=public_key,
-                issuer=issuer,
-                audience=audience,
-                algorithm=(
-                    algorithm if algorithm and algorithm.startswith("HS") else None
-                ),
-                required_scopes=required_scopes,
-            )
-            logger.info(
-                "JWTVerifier configured",
-                extra={
-                    "mode": (
-                        "JWKS"
-                        if jwks_uri
-                        else (
-                            "HMAC"
-                            if algorithm and algorithm.startswith("HS")
-                            else "Static Key"
-                        )
-                    ),
-                    "algorithm": algorithm,
-                    "required_scopes": required_scopes,
-                },
-            )
-        except Exception as e:
-            print(f"Failed to initialize JWTVerifier: {e}")
-            logger.error(f"Failed to initialize JWTVerifier: {e}")
-            sys.exit(1)
-    elif args.auth_type == "oauth-proxy":
-        if not (
-            args.oauth_upstream_auth_endpoint
-            and args.oauth_upstream_token_endpoint
-            and args.oauth_upstream_client_id
-            and args.oauth_upstream_client_secret
-            and args.oauth_base_url
-            and args.token_jwks_uri
-            and args.token_issuer
-            and args.token_audience
-        ):
-            print(
-                "oauth-proxy requires oauth-upstream-auth-endpoint, oauth-upstream-token-endpoint, "
-                "oauth-upstream-client-id, oauth-upstream-client-secret, oauth-base-url, token-jwks-uri, "
-                "token-issuer, token-audience"
-            )
-            logger.error(
-                "oauth-proxy requires oauth-upstream-auth-endpoint, oauth-upstream-token-endpoint, "
-                "oauth-upstream-client-id, oauth-upstream-client-secret, oauth-base-url, token-jwks-uri, "
-                "token-issuer, token-audience",
-                extra={
-                    "auth_endpoint": args.oauth_upstream_auth_endpoint,
-                    "token_endpoint": args.oauth_upstream_token_endpoint,
-                    "client_id": args.oauth_upstream_client_id,
-                    "base_url": args.oauth_base_url,
-                    "jwks_uri": args.token_jwks_uri,
-                    "issuer": args.token_issuer,
-                    "audience": args.token_audience,
-                },
-            )
-            sys.exit(1)
-        token_verifier = JWTVerifier(
-            jwks_uri=args.token_jwks_uri,
-            issuer=args.token_issuer,
-            audience=args.token_audience,
-        )
-        auth = OAuthProxy(
-            upstream_authorization_endpoint=args.oauth_upstream_auth_endpoint,
-            upstream_token_endpoint=args.oauth_upstream_token_endpoint,
-            upstream_client_id=args.oauth_upstream_client_id,
-            upstream_client_secret=args.oauth_upstream_client_secret,
-            token_verifier=token_verifier,
-            base_url=args.oauth_base_url,
-            allowed_client_redirect_uris=allowed_uris,
-        )
-    elif args.auth_type == "oidc-proxy":
-        if not (
-            args.oidc_config_url
-            and args.oidc_client_id
-            and args.oidc_client_secret
-            and args.oidc_base_url
-        ):
-            logger.error(
-                "oidc-proxy requires oidc-config-url, oidc-client-id, oidc-client-secret, oidc-base-url",
-                extra={
-                    "config_url": args.oidc_config_url,
-                    "client_id": args.oidc_client_id,
-                    "base_url": args.oidc_base_url,
-                },
-            )
-            sys.exit(1)
-        auth = OIDCProxy(
-            config_url=args.oidc_config_url,
-            client_id=args.oidc_client_id,
-            client_secret=args.oidc_client_secret,
-            base_url=args.oidc_base_url,
-            allowed_client_redirect_uris=allowed_uris,
-        )
-    elif args.auth_type == "remote-oauth":
-        if not (
-            args.remote_auth_servers
-            and args.remote_base_url
-            and args.token_jwks_uri
-            and args.token_issuer
-            and args.token_audience
-        ):
-            logger.error(
-                "remote-oauth requires remote-auth-servers, remote-base-url, token-jwks-uri, token-issuer, token-audience",
-                extra={
-                    "auth_servers": args.remote_auth_servers,
-                    "base_url": args.remote_base_url,
-                    "jwks_uri": args.token_jwks_uri,
-                    "issuer": args.token_issuer,
-                    "audience": args.token_audience,
-                },
-            )
-            sys.exit(1)
-        auth_servers = [url.strip() for url in args.remote_auth_servers.split(",")]
-        token_verifier = JWTVerifier(
-            jwks_uri=args.token_jwks_uri,
-            issuer=args.token_issuer,
-            audience=args.token_audience,
-        )
-        auth = RemoteAuthProvider(
-            token_verifier=token_verifier,
-            authorization_servers=auth_servers,
-            base_url=args.remote_base_url,
-        )
-
-    middlewares: List[
-        Union[
-            UserTokenMiddleware,
-            ErrorHandlingMiddleware,
-            RateLimitingMiddleware,
-            TimingMiddleware,
-            LoggingMiddleware,
-            JWTClaimsLoggingMiddleware,
-            EunomiaMcpMiddleware,
-        ]
-    ] = [
-        ErrorHandlingMiddleware(include_traceback=True, transform_errors=True),
-        RateLimitingMiddleware(max_requests_per_second=10.0, burst_capacity=20),
-        TimingMiddleware(),
-        LoggingMiddleware(),
-        JWTClaimsLoggingMiddleware(),
-    ]
-    if config["enable_delegation"] or args.auth_type == "jwt":
-        middlewares.insert(0, UserTokenMiddleware(config=config))
-
-    if args.eunomia_type in ["embedded", "remote"]:
-        try:
-            from eunomia_mcp import create_eunomia_middleware
-
-            policy_file = args.eunomia_policy_file or "mcp_policies.json"
-            eunomia_endpoint = (
-                args.eunomia_remote_url if args.eunomia_type == "remote" else None
-            )
-            eunomia_mw = create_eunomia_middleware(
-                policy_file=policy_file, eunomia_endpoint=eunomia_endpoint
-            )
-            middlewares.append(eunomia_mw)
-            logger.info(f"Eunomia middleware enabled ({args.eunomia_type})")
-        except Exception as e:
-            print(f"Failed to load Eunomia middleware: {e}")
-            logger.error("Failed to load Eunomia middleware", extra={"error": str(e)})
-            sys.exit(1)
-
-    mcp = FastMCP("Nextcloud", auth=auth)
     DEFAULT_MISCTOOL = to_boolean(os.getenv("MISCTOOL", "True"))
     if DEFAULT_MISCTOOL:
         register_misc_tools(mcp)

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/nextcloud_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextcloud-agent
-Version: 0.2.26
+Version: 0.2.28
 Summary: Nextcloud MCP Server for Agentic AI!
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: agent-utilities[agent,logfire]>=0.2.12
+Requires-Dist: agent-utilities[agent,logfire]>=0.2.14
 Requires-Dist: python-dateutil>=2.8.2
 Requires-Dist: icalendar>=6.1.1
 Requires-Dist: vobject>=0.9.9
@@ -41,7 +41,7 @@ Dynamic: license-file
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/nextcloud-agent)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/nextcloud-agent)
 
-*Version: 0.2.26*
+*Version: 0.2.28*
 
 ## Overview
 

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/nextcloud_agent.egg-info/requires.txt

@@ -1,4 +1,4 @@
-agent-utilities[agent,logfire]>=0.2.12
+agent-utilities[agent,logfire]>=0.2.14
 python-dateutil>=2.8.2
 icalendar>=6.1.1
 vobject>=0.9.9

{nextcloud_agent-0.2.26 → nextcloud_agent-0.2.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nextcloud-agent"
-version = "0.2.26"
+version = "0.2.28"
 description = "Nextcloud MCP Server for Agentic AI!"
 readme = "README.md"
 authors = [{ name = "Audel Rouhi", email = "knucklessg1@gmail.com" }]
@@ -17,7 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3"]
 requires-python = ">=3.10"
 dependencies = [
-    "agent-utilities[agent,logfire]>=0.2.12",
+    "agent-utilities[agent,logfire]>=0.2.14",
     "python-dateutil>=2.8.2",
     "icalendar>=6.1.1",
     "vobject>=0.9.9"]