Update app.py

app.py

@@ -2,10 +2,8 @@ import re
 import requests
 import gradio as gr
 
-# APIの基本URL（安定版）
 BASE_URL = "https://laws.e-gov.go.jp/api/2/laws"
 
-# よく使う法令をキャッシュ
 LAW_IDS = {
     "民法": "429AC0000000089",
     "会社法": "429AC0000000086",
@@ -14,7 +12,6 @@ LAW_IDS = {
     "不動産登記法": "429AC0000000092",
 }
 
-# 数字→漢数字変換（第3条など）
 KANJI = "零一二三四五六七八九十百"
 def int_to_kanji(num):
     if num <= 10:
@@ -29,54 +26,36 @@ def int_to_kanji(num):
 
 def parse_query(q):
     q = q.strip().replace("　", "")
-    q = re.sub(r"(?<=\d)上$", "条", q)  # 「3上」→「3条」
+    q = re.sub(r"(?<=\d)上$", "条", q)
     m = re.match(r"(?P<law>[^0-9\s条]+)\s*(第?(?P<num>\d+)条?)", q)
     if not m:
         raise ValueError("「民法3条」「会社法10条」みたいに入力して。")
     return m.group("law"), int(m.group("num"))
 
-def get_law_json(law_id):
-    url = f"{BASE_URL}?lawId={law_id}"  # ←安定版
-    res = requests.get(url, timeout=30)
-    res.raise_for_status()
-    return res.json()
+def flatten_text(obj):
+    """JSON全体から文字列だけを抽出"""
+    if isinstance(obj, str):
+        return obj
+    elif isinstance(obj, dict):
+        return "".join(flatten_text(v) for v in obj.values())
+    elif isinstance(obj, list):
+        return "".join(flatten_text(i) for i in obj)
+    return ""
 
-def extract_article(data, target_label):
-    def search_dict(obj):
-        if isinstance(obj, dict):
-            # 第◯条を探す
-            for k, v in obj.items():
-                if isinstance(v, str) and target_label in v:
-                    return obj
-            for v in obj.values():
-                result = search_dict(v)
-                if result:
-                    return result
-        elif isinstance(obj, list):
-            for v in obj:
-                result = search_dict(v)
-                if result:
-                    return result
-        return None
+def get_article(law_id, article_label):
+    url = f"{BASE_URL}?lawId={law_id}"
+    r = requests.get(url, timeout=30)
+    r.raise_for_status()
+    data = r.json()
 
-    block = search_dict(data)
-    if not block:
-        return f"{target_label} が見つかりません。"
+    text = flatten_text(data)
+    idx = text.find(article_label)
+    if idx == -1:
+        return f"{article_label} が見つかりません。"
 
-    # 段落を抽出
-    paras = []
-    def collect_text(o):
-        if isinstance(o, str):
-            paras.append(o)
-        elif isinstance(o, dict):
-            for val in o.values():
-                collect_text(val)
-        elif isinstance(o, list):
-            for i in o:
-                collect_text(i)
-
-    collect_text(block)
-    return "\n".join(paras)
+    snippet = text[idx : idx + 500]
+    snippet = re.split(r"第[一二三四五六七八九十百]+条", snippet)[0]
+    return snippet.strip()
 
 def run(q):
     try:
@@ -84,11 +63,9 @@ def run(q):
         law_id = LAW_IDS.get(law)
         if not law_id:
             return f"法令が登録されていません：「{law}」"
-        data = get_law_json(law_id)
         target = f"第{int_to_kanji(num)}条"
-        law_name = data.get("lawName", law)
-        text = extract_article(data, target)
-        return f"【{law_name}】{target}\n\n{text.strip()}"
+        text = get_article(law_id, target)
+        return f"【{law}】{target}\n\n{text}"
     except Exception as e:
         return f"❌ エラー: {e}"
 
@@ -97,7 +74,7 @@ demo = gr.Interface(
     inputs=gr.Textbox(label="例）民法3条 / 会社法10条 / 不動産登記法47条"),
     outputs=gr.Textbox(label="結果", lines=20),
     title="e-Gov 法令API v2｜条文検索",
-    description="法令名＋条番号を入れると該当条文を取得します（安定版API）。"
+    description="法令名＋条番号を入力して該当条文を取得します（安定版API・全文走査）"
 )
 
 demo.launch()