supernote 0.6.2__tar.gz → 0.7.0__tar.gz

{supernote-0.6.2 → supernote-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supernote
-Version: 0.6.2
+Version: 0.7.0
 Summary: All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services
 Author-email: jya <jya@wizmy.net>, Allen Porter <allen.porter@gmail.com>
 License-Expression: Apache-2.0

{supernote-0.6.2 → supernote-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools>=77.0"]
 
 [project]
 name = "supernote"
-version = "0.6.2"
+version = "0.7.0"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 description = "All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services"

{supernote-0.6.2 → supernote-0.7.0}/supernote/cli/server.py

@@ -2,25 +2,17 @@
 
 import argparse
 import getpass
+import hashlib
 import secrets
 
-import yaml
-
 from supernote.server import app as server_app
-from supernote.server.config import AuthConfig, ServerConfig, UsersConfig
-from supernote.server.services.user import UserService
+from supernote.server.config import ServerConfig, UserEntry
 
 
-def get_auth_config(config_dir: str | None) -> AuthConfig:
+def list_users(config_dir: str | None):
     # Load base config
     server_config = ServerConfig.load(config_dir)
-    return server_config.auth
-
-
-def list_users(config_dir: str | None):
-    config = get_auth_config(config_dir)
-    service = UserService(config)
-    for user in service.list_users():
+    for user in server_config.auth.users:
         status = "active" if user.is_active else "inactive"
         print(f"{user.username} ({status})")
 
@@ -30,13 +22,17 @@ def add_user(username: str, password: str | None = None):
         password = getpass.getpass(f"Password for {username}: ")
 
     # Generate the YAML snippet for a single user
-    user_entry = UserService.create_user_entry(username, password)
-    users_config = UsersConfig(users=[user_entry])
+    password_md5 = hashlib.md5(password.encode()).hexdigest()
+    user_entry = UserEntry(
+        username=username,
+        password_md5=password_md5,
+        display_name=username,
+    )
 
     # Print YAML to stdout
     print("# Generated Supernote User Entry")
-    print("# Append this to your users.yaml file.")
-    print(yaml.safe_dump(users_config.to_dict(), default_flow_style=False))
+    print("# Add this entry to the 'users' list in your config.yaml file.")
+    print("- " + user_entry.to_yaml(omit_none=True).strip().replace("\n", "\n  "))
 
 
 def config_init():
@@ -44,10 +40,20 @@ def config_init():
     secret = secrets.token_hex(32)
     config = ServerConfig()
     config.auth.secret_key = secret
+    config.trace_log_file = None  # Use system storage default
+
+    # Add a sample user entry to the output
+    sample_user = UserEntry(
+        username="user@example.com",
+        password_md5=hashlib.md5(b"password").hexdigest(),
+        display_name="Sample User",
+    )
+    config.auth.users = [sample_user]
 
     print("# Generated Supernote Server Configuration")
     print("# Save this as config.yaml.")
-    print(yaml.safe_dump(config.to_dict(), default_flow_style=False))
+    print("# You should change the sample user entry below.")
+    print(config.to_yaml(omit_none=True))
 
 
 def generate_secret():

{supernote-0.6.2 → supernote-0.7.0}/supernote/server/app.py

@@ -57,13 +57,18 @@ async def trace_middleware(
 
     # Get config from app
     server_config: ServerConfig = request.app["config"]
+    if not server_config.trace_log_file:
+        return await handler(request)
+
+    trace_log_path = Path(server_config.trace_log_file)
 
     try:
-        with open(server_config.trace_log_file, "a") as f:
+        trace_log_path.parent.mkdir(parents=True, exist_ok=True)
+        with open(trace_log_path, "a") as f:
             f.write(json.dumps(log_entry) + "\n")
             f.flush()
     except Exception as e:
-        logger.error(f"Failed to write to trace log: {e}")
+        logger.error(f"Failed to write to trace log at {trace_log_path}: {e}")
 
     logger.info(
         f"Trace: {request.method} {request.path} (Body: {len(body_bytes) if body_bytes else 0} bytes)"
@@ -125,6 +130,10 @@ def create_app(
     app["file_service"] = FileService(storage_service)
     app["sync_locks"] = {}  # user -> (equipment_no, expiry_time)
 
+    # Resolve trace log path if not set
+    if not config.trace_log_file:
+        config.trace_log_file = str(storage_service.system_dir / "trace.log")
+
     # Register routes
     app.add_routes(system.routes)
     app.add_routes(auth.routes)

{supernote-0.6.2 → supernote-0.7.0}/supernote/server/config.py

@@ -3,23 +3,26 @@ import os
 import secrets
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any
 
-import yaml
-from mashumaro.mixins.dict import DataClassDictMixin
+from mashumaro.config import TO_DICT_ADD_OMIT_NONE_FLAG, BaseConfig
+from mashumaro.mixins.yaml import DataClassYAMLMixin
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass
-class AuthConfig(DataClassDictMixin):
+class AuthConfig(DataClassYAMLMixin):
     secret_key: str = ""
     expiration_hours: int = 24
     users: list["UserEntry"] = field(default_factory=list)
 
+    class Config(BaseConfig):
+        omit_none = True
+        code_generation_options = [TO_DICT_ADD_OMIT_NONE_FLAG]  # type: ignore[list-item]
+
 
 @dataclass
-class UserEntry(DataClassDictMixin):
+class UserEntry(DataClassYAMLMixin):
     username: str
     password_md5: str
     is_active: bool = True
@@ -29,12 +32,16 @@ class UserEntry(DataClassDictMixin):
     avatar: str | None = None
     total_capacity: str = "25485312"
 
+    class Config(BaseConfig):
+        omit_none = True
+        code_generation_options = [TO_DICT_ADD_OMIT_NONE_FLAG]  # type: ignore[list-item]
+
 
 @dataclass
-class ServerConfig(DataClassDictMixin):
+class ServerConfig(DataClassYAMLMixin):
     host: str = "0.0.0.0"
     port: int = 8080
-    trace_log_file: str = "data/server_trace.log"
+    trace_log_file: str | None = None
     storage_dir: str = "storage"
     auth: AuthConfig = field(default_factory=AuthConfig)
 
@@ -47,25 +54,18 @@ class ServerConfig(DataClassDictMixin):
         config_dir_path = Path(config_dir)
         config_file = config_dir_path / "config.yaml"
 
-        file_data: dict[str, Any] = {}
+        config = cls()
         if config_file.exists():
             try:
                 with open(config_file, "r") as f:
-                    file_data = yaml.safe_load(f) or {}
+                    config = cls.from_yaml(f.read())
             except Exception as e:
                 logger.warning(f"Failed to load config file {config_file}: {e}")
 
-        try:
-            config = cls.from_dict(file_data)
-        except Exception as e:
-            logger.warning(
-                f"Failed to parse config file {config_file}, using defaults: {e}"
-            )
-            config = cls()
-
         # 4. JWT Secret priority: Env > Config > Random(in-memory only)
         env_secret = os.getenv("SUPERNOTE_JWT_SECRET")
         if env_secret:
+            logger.info("Using SUPERNOTE_JWT_SECRET")
             config.auth.secret_key = env_secret
 
         if not config.auth.secret_key:
@@ -77,14 +77,21 @@ class ServerConfig(DataClassDictMixin):
         # Apply other env var overrides
         if os.getenv("SUPERNOTE_HOST"):
             config.host = os.getenv("SUPERNOTE_HOST", config.host)
+            logger.info(f"Using SUPERNOTE_HOST: {config.host}")
 
         if os.getenv("SUPERNOTE_PORT"):
             try:
                 config.port = int(os.getenv("SUPERNOTE_PORT", str(config.port)))
+                logger.info(f"Using SUPERNOTE_PORT: {config.port}")
             except ValueError:
                 pass
 
         if os.getenv("SUPERNOTE_STORAGE_DIR"):
             config.storage_dir = os.getenv("SUPERNOTE_STORAGE_DIR", config.storage_dir)
+            logger.info(f"Using SUPERNOTE_STORAGE_DIR: {config.storage_dir}")
 
         return config
+
+    class Config(BaseConfig):
+        omit_none = True
+        code_generation_options = [TO_DICT_ADD_OMIT_NONE_FLAG]  # type: ignore[list-item]

{supernote-0.6.2 → supernote-0.7.0}/supernote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supernote
-Version: 0.6.2
+Version: 0.7.0
 Summary: All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services
 Author-email: jya <jya@wizmy.net>, Allen Porter <allen.porter@gmail.com>
 License-Expression: Apache-2.0