Upload folder using huggingface_hub

MANIFEST.md

@@ -1,21 +1,28 @@
 # ipfs_oman_laws manifest
 
-generated_utc: 2026-09-04T20:09:31Z
+generated_utc: 2026-09-16T21:49:25Z
 cc: om
-slug: oman
+country: Oman
 laws_rows: 1679
-articles_rows: 1743
-laws_bytes: 10143553
-articles_bytes: 644078
-laws_sha256: 10db85369ae196ec1d0843f535915ba32fe66ad1f2a13c1d6710ab25a7e6b29e
-articles_sha256: bd5f81713204348b90f6d457866d803a45cfd5152493bf17970e7eae60998f56
-laws_parquet: /workspace/legal-corpora-releases/oman/data/laws.parquet
-articles_parquet: /workspace/legal-corpora-releases/oman/data/articles.parquet
+articles_rows: 1996
+laws_bytes: 8018895
+articles_bytes: 980053
+laws_sha256: 97352dd73118798b45fa0a4512732b65e02dc5857ad15aeaa90d0365dbcd4202
+articles_sha256: 82235890e69b15456b6221fc45ce6786e9ee8210cfebbfe8d61b0c0fbdb6cc26
+laws_parquet: /workspace/legal-corpora/hf-staging/ipfs_oman_laws/data/laws.parquet
+articles_parquet: /workspace/legal-corpora/hf-staging/ipfs_oman_laws/data/articles.parquet
 compression: zstd
 collector: scrapers/collect_om.py
-source: Oman official legislation portal
-coverage: CDX/Wayback+live MJLA catalog-backed research snapshot
-snapshot_date: 2026-09-04
+license: Official MJLA texts; authentic Official Gazette prevails; not legal advice.
+source: https://mjla.gov.om/
+retrieval: live-official
+live_instruments: 1679
+archive_instruments: 0
+wayback_instruments: 0
+common_crawl_instruments: 0
+constitution_present: false
 uploaded: false
-gaps:
-  Method: cdx_parallel_expand + archive_fallbacks + collect_om live resume. Official MJLA/Gazette prevails. Not legal advice.
+gaps: |
+  In-force laws and royal decrees from official mjla.gov.om. النظام الأساسي للدولة (decree 951) included as Constitution. qanoon.om is not the official MJLA portal and was not used. TLS verify=False only after SSLError (missing intermediate; not WAF bypass). 429/403 uses archive_fallbacks of official URLs. Started 2026-09-03T05:44:14Z.
+  
+  started 2026-09-03T05:44:14Z

README.md

@@ -1,7 +1,7 @@
 ---
-pretty_name: Laws of Oman
+pretty_name: Oman Basic Statute, Laws and Royal Decrees (MJLA)
 license: other
-license_name: oman-official
+license_name: oman-mjla-terms
 language:
 - ar
 task_categories:
@@ -10,6 +10,8 @@ tags:
 - legal
 - law
 - oman
+- mjla
+- official-gazette
 - official-texts
 size_categories:
 - 1K<n<10K
@@ -21,44 +23,46 @@ configs:
   data_files: data/articles.parquet
 ---
 
-# Laws of Oman
+# Oman Basic Statute, Laws and Royal Decrees (MJLA)
 
-Research snapshot of official legislation collected from **Oman official legislation portal**.
+Research snapshot of official national legislation from **Ministry of Justice and Legal Affairs (mjla.gov.om)**.
 
-**Not legal advice.** Official gazettes / government portals prevail over this corpus.
+**Not legal advice.** The official gazette / authentic source prevails over this corpus.
 
 ## Snapshot
 
 | Field | Value |
 | --- | --- |
-| Snapshot date | 2026-09-04 |
-| Coverage | CDX/Wayback+live MJLA catalog-backed research snapshot |
-| Source | Oman official legislation portal |
+| Snapshot date | 2026-09-16 |
+| Coverage | snapshot |
+| Source | Ministry of Justice and Legal Affairs (mjla.gov.om) |
 | Collector | `scrapers/collect_om.py` |
-| Laws / instruments | 1679 |
-| Articles | 1743 |
+| Laws / instruments | 1,679 |
+| Articles | 1,996 |
 | Language | ar |
 | Jurisdiction | Oman |
-| License | `oman-official` |
+| License | `oman-mjla-terms` |
 
 ## Contents
 
-- `data/laws.parquet` — one row per instrument (id, title, full text, ELI,
-  dates, status, identifiers, article count, source URL).
-- `data/articles.parquet` — one row per article/section (`law_id`, article
-  number, title, text, source URL).
+- `data/laws.parquet` — one row per instrument (LAW_FLAT, zstd).
+- `data/articles.parquet` — article/section rows for the same snapshot.
 - `scrapers/collect_om.py` — research collector used to build this snapshot.
-- `scrapers/common.py` — shared collector helpers.
 
 ## License / reuse
 
-Official government / gazette texts; reuse per public-sector terms of the
-source portal. This packaging, metadata, and collector script are provided
-for research.
+Official MJLA texts; authentic Official Gazette prevails; not legal advice.
 
-This dataset is **not** an official consolidation and is **not legal advice**.
-The official source prevails.
+This dataset is **not legal advice**. The official source prevails.
 
-## Notes
+## Source
 
-Method: cdx_parallel_expand + archive_fallbacks + collect_om live resume. Official MJLA/Gazette prevails. Not legal advice.
+- https://mjla.gov.om/
+
+## Known gaps
+
+Basic Statute + laws + royal decrees from official mjla.gov.om. qanoon.om is not the official MJLA portal and was not used.
+
+In-force laws and royal decrees from official mjla.gov.om. النظام الأساسي للدولة (decree 951) included as Constitution. qanoon.om is not the official MJLA portal and was not used. TLS verify=False only after SSLError (missing intermediate; not WAF bypass). 429/403 uses archive_fallbacks of official URLs. Started 2026-09-03T05:44:14Z.
+
+started 2026-09-03T05:44:14Z

data/articles.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd5f81713204348b90f6d457866d803a45cfd5152493bf17970e7eae60998f56
-size 644078
+oid sha256:82235890e69b15456b6221fc45ce6786e9ee8210cfebbfe8d61b0c0fbdb6cc26
+size 980053

data/laws.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10db85369ae196ec1d0843f535915ba32fe66ad1f2a13c1d6710ab25a7e6b29e
-size 10143553
+oid sha256:97352dd73118798b45fa0a4512732b65e02dc5857ad15aeaa90d0365dbcd4202
+size 8018895

data/manifest.json

@@ -1,18 +1,18 @@
 {
   "slug": "ipfs_oman_laws",
   "cc": "om",
-  "laws_rows": 1631,
-  "articles_rows": 1513,
-  "laws_bytes": 8152333,
-  "articles_bytes": 474648,
-  "laws_sha256": "6198572874e26efa689f61813d8fb3ff0358360adac3b393b49b8211baf151f9",
-  "articles_sha256": "a985d4417cb5fab1b420b7fca2679068907b08032ae5b05c8dc4a1bd54d0d544",
+  "laws_rows": 1679,
+  "articles_rows": 1996,
+  "laws_bytes": 8018895,
+  "articles_bytes": 980053,
+  "laws_sha256": "97352dd73118798b45fa0a4512732b65e02dc5857ad15aeaa90d0365dbcd4202",
+  "articles_sha256": "82235890e69b15456b6221fc45ce6786e9ee8210cfebbfe8d61b0c0fbdb6cc26",
   "compression": "zstd",
   "collector": "collect_om.py",
   "license": "Official MJLA texts; authentic Official Gazette prevails; not legal advice.",
-  "live_instruments": 1631,
+  "live_instruments": 1679,
   "archive_instruments": 0,
-  "constitution_present": true,
+  "constitution_present": false,
   "uploaded": false,
-  "generated_utc": "2026-09-03T06:23:42Z"
+  "generated_utc": "2026-09-16T21:49:25Z"
 }

scrapers/archive_fallbacks.py

@@ -24,8 +24,10 @@ from requests.adapters import HTTPAdapter
 
 log = logging.getLogger("archive_fallbacks")
 
-WAYBACK_CDX = "https://web.archive.org/cdx/search/cdx"
-WAYBACK_WEB = "https://web.archive.org/web"
+WAYBACK_CDX = "http://web.archive.org/cdx/search/cdx"  # https SSLEOF from collector host
+WAYBACK_WEB = "http://web.archive.org/web"  # https SSLEOF from collector host
+WAYBACK_CDX_HTTP = "http://web.archive.org/cdx/search/cdx"
+WAYBACK_WEB_HTTP = "http://web.archive.org/web"
 CC_COLLINFO = "https://index.commoncrawl.org/collinfo.json"
 CC_DATA = "https://data.commoncrawl.org"
 ARCHIVE_IS_NEWEST = "https://archive.is/newest/"
@@ -55,8 +57,6 @@ _cc_indexes: Optional[list[str]] = None
 _cc_dead: set[str] = set()
 _last_wayback = 0.0
 _last_cc = 0.0
-_ssl_fail_streak = 0
-_ssl_circuit_until = 0.0
 
 
 def session() -> requests.Session:
@@ -89,26 +89,6 @@ def _sleep_cc(delay: float = 0.35) -> None:
     _last_cc = time.time()
 
 
-
-def _ssl_circuit_open() -> bool:
-    return time.time() < _ssl_circuit_until
-
-
-def _note_ssl_fail() -> None:
-    global _ssl_fail_streak, _ssl_circuit_until
-    _ssl_fail_streak += 1
-    if _ssl_fail_streak >= 3:
-        cool = min(90.0, 12.0 * _ssl_fail_streak)
-        _ssl_circuit_until = time.time() + cool
-        log.info("ssl circuit-open for %.0fs (streak=%s)", cool, _ssl_fail_streak)
-
-
-def _note_ssl_ok() -> None:
-    global _ssl_fail_streak, _ssl_circuit_until
-    _ssl_fail_streak = 0
-    _ssl_circuit_until = 0.0
-
-
 def has_brave_key() -> bool:
     return bool(
         (os.environ.get("BRAVE_API_KEY") or os.environ.get("BRAVE_SEARCH_API_KEY") or "").strip()
@@ -138,7 +118,7 @@ def is_spa_shell(html: str, text: str) -> bool:
 
 # --- Wayback ---
 
-CDX_PAGE = 80  # small pages avoid 503/429/504; resumeKey paginates
+CDX_PAGE = 200  # large single-shot limits (2000+) 504 on web.archive.org
 
 
 def _parse_cdx_json(data: Any, mime_prefix: Optional[str] = None) -> tuple[list[dict], Optional[str]]:
@@ -222,37 +202,25 @@ def _wayback_cdx_page(
         items.append(("filter", flt))
     if resume_key:
         items.append(("resumeKey", resume_key))
-    if _ssl_circuit_open():
-        log.info("wayback cdx skip (ssl circuit-open) %s", url)
-        return [], None
     _sleep_wayback(1.0)
     last_err = None
-    ladder = (page_size, 40, 20) if _ssl_fail_streak else (page_size, 50, 30, 20)
-    for attempt, psz in enumerate(ladder, 1):
+    for attempt, psz in enumerate((page_size, 120, 80), 1):
         if attempt > 1:
             items = [(k, psz if k == "limit" else v) for k, v in items]
-            _sleep_wayback(min(20.0, 2.0 * attempt))
+            _sleep_wayback(1.5)
         try:
-            r = session().get(WAYBACK_CDX, params=items, timeout=(20, 90))
+            try:
+                # Prefer HTTP CDX — HTTPS to archive.org often SSLEOF from this host
+                r = session().get(WAYBACK_CDX_HTTP, params=items, timeout=(20, 90))
+            except requests.RequestException:
+                r = session().get(WAYBACK_CDX, params=items, timeout=(20, 90))
         except requests.RequestException as exc:
             last_err = exc
             log.warning("wayback cdx fail %s: %s", url, exc)
-            if "SSL" in type(exc).__name__ or "SSL" in str(exc) or "EOF" in str(exc):
-                _note_ssl_fail()
-                if _ssl_circuit_open():
-                    break
-            time.sleep(min(8.0, 1.5 * attempt))
-            continue
-        if r.status_code == 429:
-            last_err = "http_429"
-            cool = min(60.0, 8.0 * attempt)
-            log.info("wayback cdx HTTP 429 for %s (page_size=%s) cool=%.1fs", url, psz, cool)
-            time.sleep(cool)
             continue
         if r.status_code in (502, 503, 504) or not r.content:
             last_err = f"http_{r.status_code}"
             log.info("wayback cdx HTTP %s for %s (page_size=%s)", r.status_code, url, psz)
-            time.sleep(min(20.0, 3.0 * attempt))
             continue
         if r.status_code != 200:
             log.info("wayback cdx HTTP %s for %s", r.status_code, url)
@@ -261,7 +229,6 @@ def _wayback_cdx_page(
             data = r.json()
         except Exception:
             return [], None
-        _note_ssl_ok()
         return _parse_cdx_json(data, mime_prefix=mime_prefix)
     log.info("wayback cdx gave up %s last=%s", url, last_err)
     return [], None
@@ -321,55 +288,160 @@ def search_wayback_machine(
     return out[:target]
 
 
+
 def get_wayback_content(url: str, timestamp: Optional[str] = None) -> dict:
-    """Fetch a snapshot; id_ modifier skips Wayback chrome. No CDX search."""
+    """Fetch a snapshot; id_ modifier skips Wayback chrome. No CDX search.
+
+    Prefer HTTP Wayback via curl (requests follows http→https and SSL-EOFs here).
+    Follow 3xx Location only after rewriting https://web.archive.org → http://.
+    Redirect hops do not consume the HTTP retry budget.
+    """
+    import subprocess
+
     if timestamp:
-        wb = f"{WAYBACK_WEB}/{timestamp}id_/{url}"
+        path = f"/{timestamp}id_/{url}"
     else:
-        wb = f"{WAYBACK_WEB}/2id_/{url}"
-    r = None
+        path = f"/2id_/{url}"
+    target = WAYBACK_WEB_HTTP + path
     last_err = None
-    for attempt in range(1, 5):
-        _sleep_wayback(1.2 if attempt == 1 else min(20.0, 2.5 * attempt))
+    body = b""
+    ctype = ""
+    final_url = target
+    status = 0
+    redirects_left = 8
+    attempts_left = 5
+    first = True
+    while attempts_left > 0:
+        _sleep_wayback(0.35 if not first and redirects_left < 8 else (0.8 if first else min(8.0, 1.8 * (6 - attempts_left))))
+        first = False
         try:
-            r = session().get(wb, timeout=(20, 90), allow_redirects=True)
-        except requests.RequestException as exc:
+            # Stay on HTTP: no -L (redirects flip to https and SSLEOF on this host)
+            proc = subprocess.run(
+                [
+                    "curl", "-sS", "--max-time", "90",
+                    "-A", UA,
+                    "-w", "\n__HTTP_STATUS__%{http_code}\n__CONTENT_TYPE__%{content_type}\n__URL_EFFECTIVE__%{url_effective}\n__REDIRECT_URL__%{redirect_url}",
+                    "--output", "-",
+                    target,
+                ],
+                capture_output=True,
+                timeout=100,
+            )
+            raw = proc.stdout or b""
+            marker = b"\n__HTTP_STATUS__"
+            redirect_url = ""
+            if marker in raw:
+                body, rest = raw.rsplit(marker, 1)
+                trailer = (b"__HTTP_STATUS__" + rest).decode("utf-8", "replace")
+                mstat = re.search(r"__HTTP_STATUS__(\d+)", trailer)
+                mctype = re.search(r"__CONTENT_TYPE__([^\n]*)", trailer)
+                murl = re.search(r"__URL_EFFECTIVE__([^\n]*)", trailer)
+                mredir = re.search(r"__REDIRECT_URL__([^\n]*)", trailer)
+                status = int(mstat.group(1)) if mstat else 0
+                ctype = (mctype.group(1) if mctype else "") or ""
+                final_url = (murl.group(1) if murl else target) or target
+                redirect_url = (mredir.group(1) if mredir else "") or ""
+            else:
+                body = raw
+                status = 200 if proc.returncode == 0 and raw else 0
+            if status in (301, 302, 303, 307, 308):
+                loc = (redirect_url or "").strip()
+                if loc.startswith("/"):
+                    loc = "http://web.archive.org" + loc
+                if loc.startswith("https://web.archive.org/"):
+                    loc = "http://" + loc[len("https://"):]
+                if loc.startswith("http://web.archive.org/") and redirects_left > 0:
+                    log.info("wayback replay follow HTTP redirect %s -> %s", status, loc[:120])
+                    target = loc
+                    final_url = loc
+                    redirects_left -= 1
+                    continue  # redirect hop: do not consume attempts_left
+                last_err = f"http_{status}_bad_redirect"
+                log.info("wayback replay HTTP %s bad redirect %s", status, (loc or "")[:160])
+                attempts_left -= 1
+                continue
+            if proc.returncode != 0 and not body:
+                last_err = (proc.stderr or b"").decode("utf-8", "replace")[:300] or f"curl_rc_{proc.returncode}"
+                log.info("wayback replay curl fail %s: %s", url, last_err)
+                attempts_left -= 1
+                continue
+            if status in (403, 429, 503, 502, 504) and attempts_left > 1:
+                log.info("wayback replay HTTP %s %s attempts_left=%s", status, url, attempts_left)
+                attempts_left -= 1
+                continue
+            break
+        except Exception as exc:
             last_err = str(exc)
             log.info("wayback replay fail %s: %s", url, exc)
+            attempts_left -= 1
             continue
-        if r.status_code in (403, 429, 503, 502, 504) and attempt < 4:
-            log.info("wayback replay HTTP %s %s attempt=%s", r.status_code, url, attempt)
-            continue
-        break
-    if r is None:
-        return {"status": "error", "error": last_err or "no_response", "url": url}
+    else:
+        # fallback: requests without following redirects to https
+        try:
+            hops = 0
+            while hops < 8:
+                r = session().get(target, timeout=(20, 90), allow_redirects=False)
+                status = r.status_code
+                body = r.content or b""
+                ctype = r.headers.get("content-type") or ""
+                final_url = r.url or target
+                if status not in (301, 302, 303, 307, 308):
+                    break
+                loc = (r.headers.get("Location") or "").strip()
+                if loc.startswith("/"):
+                    loc = "http://web.archive.org" + loc
+                if loc.startswith("https://web.archive.org/"):
+                    loc = "http://" + loc[len("https://"):]
+                if not loc.startswith("http://web.archive.org/"):
+                    last_err = f"http_{status}_bad_redirect"
+                    break
+                target = loc
+                final_url = loc
+                hops += 1
+        except requests.RequestException as exc:
+            return {"status": "error", "error": last_err or str(exc), "url": url}
+
+    if (not body and status != 200) or status == 404:
+        # /2id_/ sometimes lands on a missing capture; pick an explicit CDX 200 snapshot.
+        if not timestamp:
+            try:
+                hits = search_wayback_machine(url, limit=5, filter_status="200", collapse="digest")
+                for hit in hits:
+                    ts = hit.get("timestamp") or ""
+                    orig = hit.get("original") or url
+                    if not ts:
+                        continue
+                    alt = get_wayback_content(orig, timestamp=ts)
+                    if alt.get("status") == "success" and (alt.get("content") or b""):
+                        return alt
+                    # also try original host/path casing from CDX
+            except Exception as exc:
+                log.info("wayback cdx retry after http_%s: %s", status, exc)
+        return {"status": "error", "error": last_err or f"http_{status}", "url": url}
     cap_ts = timestamp or ""
-    m = re.search(r"/web/(\d{14})", r.url or "")
+    m = re.search(r"/web/(\d{14})", final_url or "")
     if m:
         cap_ts = m.group(1)
-    ctype = r.headers.get("content-type") or ""
-    body = r.content or b""
     text = ""
     if "html" in ctype or "xml" in ctype or "text/" in ctype or not ctype:
-        enc = r.encoding or "utf-8"
         try:
-            text = body.decode(enc, "replace")
-        except Exception:
             text = body.decode("utf-8", "replace")
-    if r.status_code != 200 or not body:
+        except Exception:
+            text = ""
+    if status != 200 or not body:
         return {
             "status": "error",
-            "error": f"http_{r.status_code}",
-            "http_status": r.status_code,
-            "wayback_url": r.url,
+            "error": f"http_{status}",
+            "http_status": status,
+            "wayback_url": final_url,
             "original_url": url,
         }
-    if text and is_challenge(text, r.status_code):
+    if text and is_challenge(text, status):
         return {
             "status": "error",
             "error": "challenge_or_shell",
-            "http_status": r.status_code,
-            "wayback_url": r.url,
+            "http_status": status,
+            "wayback_url": final_url,
             "original_url": url,
             "content": text[:2000],
         }
@@ -378,58 +450,50 @@ def get_wayback_content(url: str, timestamp: Optional[str] = None) -> dict:
         "content": body,
         "text": text,
         "content_type": ctype,
-        "wayback_url": r.url,
+        "wayback_url": final_url,
         "capture_timestamp": cap_ts,
         "original_url": url,
-        "http_status": r.status_code,
-        "method": "wayback",
+        "http_status": status,
+        "method": "wayback_curl_http",
     }
 
 
 # --- Common Crawl ---
 
+def _http_cc_index(url: str) -> str:
+    if url.startswith("https://index.commoncrawl.org"):
+        return "http://" + url[len("https://"):]
+    return url
+
+
 def cc_indexes(n: int = 6) -> list[str]:
     global _cc_indexes
     if _cc_indexes is None:
-        try:
-            r = session().get(CC_COLLINFO, timeout=30)
-            cols = r.json() if r.status_code == 200 else []
-            ids = []
-            for c in cols:
-                cid = c.get("id") or ""
-                cdx = c.get("cdx-api") or c.get("cdx_api") or ""
-                if cid:
-                    ids.append(cdx or f"https://index.commoncrawl.org/{cid}-index")
-            # Prefer mid-list crawls first (newest often SSL-flaky).
-            if ids:
-                _cc_indexes = ids[4:] + ids[:4]
-            else:
-                _cc_indexes = [
-                    "https://index.commoncrawl.org/CC-MAIN-2024-33-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2024-42-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2024-51-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2025-08-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2025-18-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2025-33-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2026-08-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2026-25-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2026-30-index",
-                    "https://index.commoncrawl.org/CC-MAIN-2026-34-index",
-                ]
-        except Exception as exc:
-            log.warning("cc collinfo: %s", exc)
-            _cc_indexes = [
-                "https://index.commoncrawl.org/CC-MAIN-2024-33-index",
-                "https://index.commoncrawl.org/CC-MAIN-2024-42-index",
-                "https://index.commoncrawl.org/CC-MAIN-2024-51-index",
-                "https://index.commoncrawl.org/CC-MAIN-2025-08-index",
-                "https://index.commoncrawl.org/CC-MAIN-2025-18-index",
-                "https://index.commoncrawl.org/CC-MAIN-2025-33-index",
-                "https://index.commoncrawl.org/CC-MAIN-2026-08-index",
-                "https://index.commoncrawl.org/CC-MAIN-2026-25-index",
-                "https://index.commoncrawl.org/CC-MAIN-2026-30-index",
-                "https://index.commoncrawl.org/CC-MAIN-2026-34-index",
-            ]
+        cols = []
+        last_exc = None
+        for coll in (CC_COLLINFO, CC_COLLINFO.replace("https://", "http://", 1)):
+            try:
+                r = session().get(coll, timeout=30)
+                if r.status_code == 200:
+                    cols = r.json() or []
+                    break
+            except Exception as exc:
+                last_exc = exc
+                log.warning("cc collinfo %s: %s", coll, exc)
+        ids = []
+        for c in cols:
+            cid = c.get("id") or ""
+            cdx = c.get("cdx-api") or c.get("cdx_api") or ""
+            if cid:
+                ids.append(_http_cc_index(cdx or f"http://index.commoncrawl.org/{cid}-index"))
+        # collinfo is newest-first. Do not drop crawls that 404 a
+        # specific URL (that means "no captures", not a dead index).
+        _cc_indexes = ids or [
+            "http://index.commoncrawl.org/CC-MAIN-2026-34-index",
+            "http://index.commoncrawl.org/CC-MAIN-2024-33-index",
+        ]
+        if last_exc and not ids:
+            log.warning("cc collinfo fallback indexes after %s", last_exc)
     return _cc_indexes[:n]
 
 
@@ -451,29 +515,16 @@ def search_common_crawl(url: str, *, limit: int = 80, indexes: Optional[list[str
             "output": "json",
             "limit": str(limit),
         }
-        if _ssl_circuit_open():
-            log.info("cc cdx skip (ssl circuit-open)")
-            break
-        r = None
-        tries = 2 if _ssl_fail_streak else 3
-        for attempt in range(1, tries + 1):
-            _sleep_cc(0.35 if attempt == 1 else min(4.0, 1.2 * attempt))
+        _sleep_cc(0.3)
+        try:
+            r = session().get(idx, params=params, timeout=(12, 25))
+        except requests.RequestException as exc:
+            alt = _http_cc_index(idx) if idx.startswith("https://") else idx.replace("http://", "https://", 1)
             try:
-                r = session().get(idx, params=params, timeout=(10, 25))
-                _note_ssl_ok()
-                break
-            except requests.RequestException as exc:
-                log.info("cc cdx %s fail attempt=%s %s", idx.split("/")[-1], attempt, exc)
-                if "SSL" in type(exc).__name__ or "SSL" in str(exc) or "EOF" in str(exc):
-                    _note_ssl_fail()
-                time.sleep(min(6.0, 1.5 * attempt))
-                r = None
-                if _ssl_circuit_open():
-                    break
-        if r is None:
-            if _ssl_circuit_open():
-                break
-            continue
+                r = session().get(alt, params=params, timeout=(12, 25))
+            except requests.RequestException as exc2:
+                log.info("cc cdx %s fail %s / %s", idx, exc, exc2)
+                continue
         if r.status_code == 404:
             msg = (r.text or "")[:80]
             log.info("cc cdx no-captures %s %s", idx.split("/")[-1], msg)
@@ -485,10 +536,6 @@ def search_common_crawl(url: str, *, limit: int = 80, indexes: Optional[list[str
             _cc_dead.add(idx)
             log.info("cc cdx dead HTTP %s %s", r.status_code, idx.split("/")[-1])
             continue
-        if r.status_code in (429, 502, 503, 504):
-            log.info("cc cdx HTTP %s %s (backoff)", r.status_code, idx.split("/")[-1])
-            time.sleep(8.0)
-            continue
         if r.status_code != 200 or not r.content:
             log.info("cc cdx HTTP %s %s", r.status_code, idx.split("/")[-1])
             continue
@@ -514,7 +561,7 @@ def search_common_crawl(url: str, *, limit: int = 80, indexes: Optional[list[str
             out.append(rec)
         if out:
             log.info("cc cdx %s hits=%s", idx.split("/")[-1], len(out))
-        if len(out) >= limit:
+        if len(out) >= limit or out:
             break
     return out[:limit]
 

scrapers/collect_om.py

@@ -225,6 +225,11 @@ def add_item(items, seen, row: dict):
 
 def page_title(html: str, fallback: str) -> str:
     # item heading often in h3.card-title or near تحميل
+    chrome = (
+        "التشريعات", "مكتبة الإصدارات",
+        "وزارة العدل و الشؤون القانونية", "وزارة العدل والشؤون القانونية",
+        "وزارة العدل و الشؤون القانونية",
+    )
     for pat in (
         r"<h[1-3][^>]*class=\"[^\"]*card-title[^\"]*\"[^>]*>([\s\S]{3,240})</h[1-3]>",
         r"<h1[^>]*>([\s\S]{3,240})</h1>",
@@ -234,7 +239,7 @@ def page_title(html: str, fallback: str) -> str:
         if m:
             t = re.sub(r"\s+", " ", re.sub(r"<[^>]+>", " ", m.group(1))).strip()
             t = re.sub(r"^\s*(التشريعات|مكتبة الإصدارات|وزارة العدل)[^|]*\|\s*", "", t)
-            if t and t not in ("التشريعات", "مكتبة الإصدارات"):
+            if t and t not in chrome and not t.startswith("وزارة العدل"):
                 return t[:300]
     return fallback
 
@@ -329,6 +334,8 @@ def fetch_one(it: dict, done: set[str]) -> str:
     page = official_get(page_url)
     html = page.get("text") or ""
     title = page_title(html, it.get("title") or f"{kind} {lid}")
+    if kind == "constitution" or lid == CONST_DECREE:
+        title = it.get("title") or "النظام الأساسي للدولة"
     text = ""
     backend = page.get("method") or "live"
     used = page.get("final_url") or page_url

scrapers/common.py

@@ -233,15 +233,9 @@ def xml_to_text(raw: str, skip_tags: Optional[set[str]] = None) -> str:
 
 
 ARTICLE_SPLIT = re.compile(
-    r"(?im)^\s*((?:"
-    r"art(?:icle|ikel|\.)|§|článek|článok|član|artikkel|articolo|"
-    r"artigo|artículo|artykuł|art\.|str\.|para(?:graph)?\.?|szakasz|"
-    r"المادة|مادة"
-    r")"
-    r"[ \t]*[\(\[\{\u202a\u202b\u202c]*[ \t]*"
-    r"[\dIVXLCDM\u0660-\u0669]+[a-zA-Z]?"
-    r"[ \t]*[\)\]\}\u202a\u202b\u202c]*"
-    r")"
+    r"(?im)^\s*((?:art(?:icle|ikel|\.)|§|článek|článok|član|artikkel|articolo|"
+    r"artigo|artículo|artykuł|art\.|str\.|para(?:graph)?\.?|szakasz)\s+"
+    r"[\dIVXLCDM]+[a-zA-Z]?)\b"
 )
 
 
@@ -515,8 +509,13 @@ def iso_date(val: Optional[str]) -> Optional[str]:
 def pdf_bytes_to_text(raw: bytes, timeout: int = 180) -> str:
     """Extract text from PDF bytes via pdftotext. Empty on failure."""
     import subprocess
-    if not raw or raw[:4] != b"%PDF":
+    if not raw:
         return ""
+    if raw[:4] != b"%PDF":
+        idx = raw.find(b"%PDF", 0, 8192)
+        if idx < 0:
+            return ""
+        raw = raw[idx:]
     try:
         with tempfile.NamedTemporaryFile(suffix=".pdf", delete=True) as tmp:
             tmp.write(raw)