Merge branch 'master' into mypy-fastapi

Author: cdrini

.vscode/launch.json

@@ -5,7 +5,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Python: Attach",
+      "name": "OL: Attach to Web Container",
       "type": "debugpy",
       "request": "attach",
       "connect": {
@@ -18,6 +18,21 @@
           "remoteRoot": "/openlibrary/"
         }
       ]
+    },
+    {
+      "name": "OL: Attach to FastAPI Container",
+      "type": "debugpy",
+      "request": "attach",
+      "connect": {
+        "host": "localhost",
+        "port": 3001
+      },
+      "pathMappings": [
+        {
+          "localRoot": "${workspaceFolder}",
+          "remoteRoot": "/openlibrary/"
+        }
+      ]
     }
   ]
 }

bundlesize.config.json

@@ -24,10 +24,6 @@
       "path": "static/build/js/add-book.*.js",
       "maxSize": "4KB"
     },
-    {
-      "path": "static/build/js/readmore.*.js",
-      "maxSize": "3KB"
-    },
     {
       "path": "static/build/js/modal-links.*.js",
       "maxSize": "7KB"

compose.override.yaml

@@ -9,7 +9,7 @@ services:
       dockerfile: docker/Dockerfile.oldev
     ports:
       # Debugger
-      - 3000:3000
+      - 127.0.0.1:3000:3000
     volumes:
       # Persistent volume mount for installed git submodules
       - ol-vendor:/openlibrary/vendor
@@ -30,6 +30,9 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.oldev
+    ports:
+      # Debugger
+      - 127.0.0.1:3001:3000
     volumes:
       - .:/openlibrary
     environment:

compose.production.yaml

@@ -337,7 +337,7 @@ services:
   # This job runs various monitoring/grafana checks across the entire cluster.
   # It has access to the other nodes via the docker socket.
   monitoring:
-    profiles: ["ol-web0", "ol-web1", "ol-web2", "ol-covers0", "ol-www0", "ol-solr0", "ol-solr1"]
+    profiles: ["ol-web0", "ol-web1", "ol-web2", "ol-covers0", "ol-www0", "ol-solr0", "ol-solr1", "ol-home0"]
     build:
       context: .
       dockerfile: scripts/monitoring/Dockerfile

compose.yaml

@@ -20,7 +20,7 @@ services:
     image: "${OLIMAGE:-oldev:latest}"
     environment:
       - OL_CONFIG=${OL_CONFIG:-/openlibrary/conf/openlibrary.yml}
-      - GUNICORN_OPTS=${GUNICORN_OPTS:- --reload --workers 2 --timeout 180 --max-requests 500}
+      - GUNICORN_OPTS=${GUNICORN_OPTS:- --reload --workers 1 --timeout 180 --max-requests 500}
     command: docker/ol-web-fastapi-start.sh
     ports:
       - ${FAST_WEB_PORT:-18080}:8080

openlibrary/asgi_app.py

@@ -4,6 +4,7 @@
 import os
 import re
 import sys
+from contextlib import asynccontextmanager
 from pathlib import Path
 
 import yaml
@@ -115,8 +116,28 @@ async def i18n_middleware(request: Request, call_next):
         return response
 
 
+def setup_debugpy():
+    import debugpy  # noqa: T100
+
+    # Start listening for debugger connections
+    debugpy.listen(('0.0.0.0', 3000))  # noqa: T100
+    logger.info(
+        "🐛 Debugger ready to attach from VS Code! Select 'OL: Attach to FastAPI Container'."
+    )
+
+
 sentry: Sentry | None = None
 
+  
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    """Lifespan context manager for startup and shutdown events."""
+    # Startup
+    if os.environ.get("LOCAL_DEV", "false").lower() == "true":
+        setup_debugpy()
+    yield
+    # Shutdown (if needed in the future)
+
 
 def create_app() -> FastAPI | None:
     if "pytest" not in sys.modules:
@@ -141,7 +162,12 @@ def create_app() -> FastAPI | None:
             logger.exception("Failed to initialize legacy WSGI app")
             raise
 
-    app = FastAPI(title="OpenLibrary ASGI", version="0.0.1")
+    app = FastAPI(
+        title="OpenLibrary ASGI",
+        version="0.0.1",
+        debug=os.environ.get("LOCAL_DEV", "false").lower() == "true",
+        lifespan=lifespan,
+    )
 
     app.add_middleware(
         CORSMiddleware,
@@ -178,11 +204,11 @@ async def set_context(request: Request, call_next):
     def health() -> dict[str, str]:
         return {"status": "ok"}
 
-    from openlibrary.fastapi.account import router as account_router  # type: ignore
-    from openlibrary.fastapi.languages import router as languages_router  # type: ignore
-    from openlibrary.fastapi.publishers import router as publishers_router  # type: ignore
-    from openlibrary.fastapi.search import router as search_router  # type: ignore
-    from openlibrary.fastapi.subjects import router as subjects_router  # type: ignore
+    from openlibrary.fastapi.account import router as account_router
+    from openlibrary.fastapi.languages import router as languages_router
+    from openlibrary.fastapi.publishers import router as publishers_router
+    from openlibrary.fastapi.search import router as search_router
+    from openlibrary.fastapi.subjects import router as subjects_router
 
     # Include routers
     app.include_router(languages_router)

openlibrary/components/lit/OLReadMore.js

@@ -7,13 +7,17 @@ import { LitElement, html, css } from 'lit';
  * - Height-based: Use `max-height` attribute (e.g., "81px")
  * - Line-based: Use `max-lines` attribute (e.g., "4")
  *
+ * @property {String} background-color - Background color for the gradient fade (default: white)
+ * @property {String} label-size - Size of the toggle button text: "medium" (default) or "small" (12px)
+ * @property {String} padding-left - Left padding for toggle button on non-mobile (e.g., "8" or "8px")
+ *
  * @example
  * <ol-read-more max-height="100px" more-text="Read more" less-text="Read less">
  *   <p>Long content here...</p>
  * </ol-read-more>
  *
  * @example
- * <ol-read-more max-lines="4">
+ * <ol-read-more max-lines="4" background-color="#f5f5f5" label-size="small">
  *   <p>Long content here...</p>
  * </ol-read-more>
  */
@@ -23,6 +27,9 @@ export class OLReadMore extends LitElement {
         maxLines: { type: Number, attribute: 'max-lines' },
         moreText: { type: String, attribute: 'more-text' },
         lessText: { type: String, attribute: 'less-text' },
+        backgroundColor: { type: String, attribute: 'background-color' },
+        labelSize: { type: String, attribute: 'label-size' },
+        paddingLeft: { type: String, attribute: 'padding-left' },
         // Internal state
         _expanded: { type: Boolean, state: true },
         _unnecessary: { type: Boolean, state: true },
@@ -35,6 +42,7 @@ export class OLReadMore extends LitElement {
             --ol-readmore-link-color: hsl(202, 96%, 28%);
             --ol-readmore-gradient-color: white;
             --ol-readmore-gradient-color-transparent: rgba(255, 255, 255, 0);
+            --ol-readmore-padding-left: 0;
         }
 
         .content-wrapper {
@@ -68,6 +76,7 @@ export class OLReadMore extends LitElement {
                 var(--ol-readmore-gradient-color) 12px
             );
             border: none;
+            border-radius: 0 0 4px 4px;
             cursor: pointer;
         }
 
@@ -85,7 +94,7 @@ export class OLReadMore extends LitElement {
 
         @media only screen and (min-width: 800px) {
             .toggle-btn {
-                padding-left: 0;
+                padding-left: var(--ol-readmore-padding-left);
                 text-align: left;
             }
         }
@@ -105,6 +114,12 @@ export class OLReadMore extends LitElement {
         .chevron.up {
             transform: rotate(180deg);
         }
+
+        .toggle-btn.small {
+            font-size: 12px;
+            padding-top: 16px;
+            padding-bottom: 8px;
+        }
     `;
 
     constructor() {
@@ -113,12 +128,39 @@ export class OLReadMore extends LitElement {
         this.maxLines = null;
         this.moreText = 'Read More';
         this.lessText = 'Read Less';
+        this.backgroundColor = null;
+        this.labelSize = 'medium';
+        this.paddingLeft = null;
         this._expanded = false;
         this._unnecessary = false;
     }
 
     firstUpdated() {
         this._checkIfTruncationNeeded();
+        this._updateBackgroundColor();
+        this._updatePaddingLeft();
+    }
+
+    updated(changedProperties) {
+        if (changedProperties.has('backgroundColor')) {
+            this._updateBackgroundColor();
+        }
+        if (changedProperties.has('paddingLeft')) {
+            this._updatePaddingLeft();
+        }
+    }
+
+    _updateBackgroundColor() {
+        if (this.backgroundColor) {
+            this.style.setProperty('--ol-readmore-gradient-color', this.backgroundColor);
+        }
+    }
+
+    _updatePaddingLeft() {
+        if (this.paddingLeft) {
+            const value = /^\d+$/.test(this.paddingLeft) ? `${this.paddingLeft}px` : this.paddingLeft;
+            this.style.setProperty('--ol-readmore-padding-left', value);
+        }
     }
 
     _checkIfTruncationNeeded() {
@@ -171,6 +213,7 @@ export class OLReadMore extends LitElement {
     render() {
         const showMoreBtn = !this._expanded && !this._unnecessary;
         const showLessBtn = this._expanded && !this._unnecessary;
+        const sizeClass = this.labelSize === 'small' ? 'small' : '';
 
         return html`
             <div
@@ -180,15 +223,15 @@ export class OLReadMore extends LitElement {
                 <slot></slot>
             </div>
             <button
-                class="toggle-btn more ${showMoreBtn ? '' : 'hidden'}"
+                class="toggle-btn more ${sizeClass} ${showMoreBtn ? '' : 'hidden'}"
                 aria-expanded="false"
                 @click="${this._handleMoreClick}"
             >
                 ${this.moreText}
                 <svg class="chevron" aria-hidden="true" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="m6 9 6 6 6-6"/></svg>
             </button>
             <button
-                class="toggle-btn less ${showLessBtn ? '' : 'hidden'}"
+                class="toggle-btn less ${sizeClass} ${showLessBtn ? '' : 'hidden'}"
                 aria-expanded="true"
                 @click="${this._handleLessClick}"
             >

openlibrary/core/edits.py

@@ -170,14 +170,6 @@ def update_submitter_name(cls, submitter: str, new_username: str, _test=False):
         t.rollback() if _test else t.commit()
         return rows_changed
 
-    @classmethod
-    def submit_delete_request(cls, olid, submitter, comment=None):
-        if not comment:
-            # some default note from submitter
-            pass
-        url = f"{olid}/-/edit?m=delete"
-        cls.submit_request(cls, url, submitter=submitter, comment=comment)
-
     @classmethod
     def submit_request(
         cls,

openlibrary/i18n/messages.pot

@@ -618,14 +618,6 @@ msgstr ""
 msgid "Listen"
 msgstr ""
 
-#: ReadMore.html
-msgid "Read more"
-msgstr ""
-
-#: ReadMore.html
-msgid "Read less"
-msgstr ""
-
 #: RecentChanges.html RecentChangesAdmin.html RecentChangesUsers.html
 #: admin/ip/view.html admin/people/edits.html history.html
 #: recentchanges/render.html recentchanges/updated_records.html