Refactor: Standardize naming conventions and reorganize imports

src/WDYe/common.py

@@ -12,6 +12,7 @@
 import logging
 
 import pywikibot
+
 from bots_subs.wd_api import newdesc
 from desc_dicts.descraptions import DescraptionsTable
 

src/WDYe/disam2.py

@@ -11,6 +11,7 @@
 import logging
 
 import pywikibot
+
 from bots_subs import open_url
 from bots_subs.wd_api import wd_bot, wd_sparql_bot
 from bots_subs.wd_api.wd_desc import work_api_desc

src/WDYe/med.py

@@ -13,12 +13,12 @@
 import urllib
 import urllib.parse
 
+from shared.api_page import load_main_api
+
 from bots_subs import open_url
 from bots_subs.hi_api import HimoAPIBot
 from bots_subs.wd_api import wd_sparql_bot
 
-from shared.api_page import load_main_api
-
 WD_API_Bot = HimoAPIBot(mr_or_bot="mr", www="www")
 
 logger = logging.getLogger(__name__)

src/cy/cy_bot/cy_regs.py

@@ -1,10 +1,4 @@
-"""
-
-from .cy_regs import make_data_new
-
-python3 I:/core/bots/wd_core/cy/cy_bot/cy_regs.py
-
-"""
+""" """
 
 import wikitextparser as wtp
 

src/cy/cy_bot/do_text.py

@@ -53,7 +53,7 @@ def template_params(text: str, title):
     # ---
     parser = wtp.parse(text)
     # ---
-    Qid = ""
+    qid_str = ""
     results = False
     # ---
     for template in parser.templates:
@@ -80,13 +80,13 @@ def template_params(text: str, title):
             t_id = get_temp_arg(template, "id")
             if t_id:
                 printt("** found currect line")
-                Qid = t_id
-                printt(f"id: {Qid}")
+                qid_str = t_id
+                printt(f"id: {qid_str}")
                 results = True
             # ---
             break
     # ---
-    return Qid, results
+    return qid_str, results
 
 
 def findflag(race, flag):
@@ -647,15 +647,15 @@ def make_new_text(item, title, text: str):
     Newsect = Frist + "\n" + Newsect + "{{نتيجة سباق الدراجات/نهاية}}"
     Newsect = re.sub(r"\n\n{{نتيجة سباق الدراجات/نهاية}}", "\n{{نتيجة سباق الدراجات/نهاية}}", Newsect)
     # ---
-    NewText = text.replace(old_sect, Newsect)
+    new_text = text.replace(old_sect, Newsect)
     # ---
     printt(f"showDiff of page: {title}<br>")
     # ---
     if title not in states:
         return text
     # ---
-    if states[title]["new_line"] != 0 or states[title]["removed_line"] != 0 and text != NewText:
-        return NewText
+    if states[title]["new_line"] != 0 or states[title]["removed_line"] != 0 and text != new_text:
+        return new_text
     else:
         printo("nodiff")
     # ---
@@ -672,10 +672,10 @@ def do_One_Page(title, text: str, item: str = ""):
     # ---
     printt("**Isre: ")
     # ---
-    Qid, QidinTemplate = template_params(text, title)
+    qid_str, QidinTemplate = template_params(text, title)
     # ---
     if QidinTemplate:
-        item = Qid
+        item = qid_str
     # ---
     if not item:
         hte = "<!-- Can't find item in page :\"" + title + '" --> '
@@ -690,15 +690,15 @@ def do_One_Page(title, text: str, item: str = ""):
     # ---
     printt(f"**item: {item}")
     # ---
-    NewText = make_new_text(item, title, text)
+    new_text = make_new_text(item, title, text)
     # ---
-    if not NewText:
+    if not new_text:
         ur = f'<a href="https://www.wikidata.org/wiki/{item}">{item}</a>.'
         printo(f"لا توجد نتائج لهذه الصفحة تأكد من صحة معرف ويكي بيانات: {ur}.")
         return text
     # ---
-    if NewText == "nodiff":
+    if new_text == "nodiff":
         printo("nodiff")
         return text
     # ---
-    return NewText
+    return new_text

src/cy/jsub.py

@@ -1,32 +1,17 @@
 #!/usr/bin/python3
 """
-tfj run jsubx --image python3.9 --command "$HOME/local/bin/python3 core8/pwb.py cy/jsub -ns:10 -cat:تصنيف:سجل_فوز_دراج_من_ويكي_بيانات/قوالب"
 
-python3 core8/pwb.py cy/jsub -page:جيروين_بلايلفينس ask
-python3 core8/pwb.py cy/jsub -page:إديتا_بوتشينسكايتي
-python3 core8/pwb.py cy/jsub -page:
-python3 core8/pwb.py cy/jsub -page:قالب:نتيجة_سباق_الدراجات/ميغيل_إندوراين
-python3 core8/pwb.py cy/jsub -page:قالب:نتيجة_سباق_الدراجات/ألبيرتو_كونتادور
-python3 core8/pwb.py cy/jsub -page:
-python3 core8/pwb.py cy/jsub -page:
-python3 core8/pwb.py cy/jsub -page:كريس_فروم
 
-python3 core8/pwb.py cy/jsub -ref:قالب:نتيجة_سباق_الدراجات/بداية
-python3 core8/pwb.py cy/jsub -cat:
-python3 core8/pwb.py cy/jsub -ns:10 -cat:تصنيف:سجل_فوز_دراج_من_ويكي_بيانات/قوالب
-python3 core8/pwb.py cy/jsub -cat:
-python3 core8/pwb.py cy/jsub -cat:
-python3 core8/pwb.py cy/jsub -cat:تصنيف:سجل_فوز_دراج_من_ويكي_بيانات
 
 https://www.wikidata.org/wiki/Wikidata:Pywikibot_-_Python_3_Tutorial/Gathering_data_from_Arabic-Wikipedia
 
 """
 
-import wd_gent
-from cy_bot.do_text import do_One_Page
-
 from shared.api_page import load_main_api
 
+from cy.cy_bot.do_text import do_One_Page
+from wd_core import wd_gent
+
 skip_titles = [
     "قالب:نتيجة سباق الدراجات",
     "قالب:نتيجة سباق الدراجات/بداية",

src/cy/mv.py

@@ -18,11 +18,11 @@
 import sys
 
 import tqdm
-import wd_gent
 import wikitextparser as wtp
-
 from shared.api_page import load_main_api
 
+import wd_gent
+
 logger = logging.getLogger(__name__)
 
 

src/des/book.py

@@ -3,8 +3,6 @@
 
 إضافة وصف للكتب والقصص
 
-python3 core8/pwb.py des/book optional
-python3 core8/pwb.py des/book ask
 
 python pwb.py des/book
 
@@ -14,9 +12,9 @@
 import re
 import sys
 
-from bots_subs.wd_api import wd_bot
-from bots_subs.wd_api.wd_desc import work_api_desc
-from bots_subs.wd_api.wd_sparql_bot import sparql_generator_big_results
+from wd_api import wd_bot
+from wd_api.wd_desc import work_api_desc
+from wd_api.wd_sparql_bot import sparql_generator_big_results
 
 logger = logging.getLogger(__name__)
 
@@ -66,11 +64,11 @@
 }
 
 
-def one_book_item(Qid, pa, lang, keys) -> None:
+def one_book_item(qid_str, pa, lang, keys) -> None:
     item = wd_bot.Get_Item_API_From_Qid(pa["item"])
     if not item:
         return
-    # desc = MakeDesc(Qid, auth, lang)
+    # desc = MakeDesc(qid_str, auth, lang)
     # Summary= 'Bot: - Add descriptions: '+ lang
     keys = sorted(keys)
     # ---
@@ -80,7 +78,7 @@ def one_book_item(Qid, pa, lang, keys) -> None:
     logger.info(f"keys:{str(keys)}")
     # ---
     descriptions = item["descriptions"]
-    NewDesc = {}
+    new_desc_data = {}
     addedlangs = []
     # ---
     for lang in keys:
@@ -89,8 +87,8 @@ def one_book_item(Qid, pa, lang, keys) -> None:
             lang2 = lang
             if lang in ("en-ca", "en-gb"):
                 lang2 = "en"
-            if des := MakeDesc(Qid, pa, lang2):
-                NewDesc[lang] = {"language": lang, "value": des}
+            if des := MakeDesc(qid_str, pa, lang2):
+                new_desc_data[lang] = {"language": lang, "value": des}
                 dns = ""
                 if "endes" in pa:
                     dns = pa["endes"]
@@ -100,20 +98,20 @@ def one_book_item(Qid, pa, lang, keys) -> None:
                 logger.info(f'*no desc for "{lang}"')
         # ---
     if addedlangs:
-        qitem = Qid  # item.title(as_link=False)
+        qitem = qid_str  # item.title(as_link=False)
         if AskSave[1]:
             logger.info(f"================== + {addedlangs}")
-            for lan, value in NewDesc.items():
-                logger.info(f"""lang:{lan}, value: \"{value['value']}\"""")
+            for lan, value in new_desc_data.items():
+                logger.info(f"""lang:{lan}, value: \"{value["value"]}\"""")
             saaa = input("<<lightyellow>> Add as descriptions? ")
             if saaa in ["y", "a", ""]:
                 if saaa == "a":
                     AskSave[1] = False
-                work_api_desc(NewDesc, qitem)
+                work_api_desc(new_desc_data, qitem)
             else:
                 logger.info("* rong answer")
         else:
-            work_api_desc(NewDesc, qitem)
+            work_api_desc(new_desc_data, qitem)
 
 
 Comma = {
@@ -139,13 +137,13 @@ def one_book_item(Qid, pa, lang, keys) -> None:
 Comma2 = {"ar": "، و", "en": ", ", "de": ", ", "fr": ", ", "nl": ", "}
 
 
-def GetQuery(Qid, lang, keys):
-    P50 = "P175" if Qid == "Q482994" else "P50"
+def GetQuery(qid_str, lang, keys):
+    P50 = "P175" if qid_str == "Q482994" else "P50"
     # ---
     # sa = ('?item wdt:P136 wd:Q8261 . ?item wdt:P31* wd:Q7725634 .\n')
-    sa = f"?item wdt:P31 wd:{Qid} .\n"
+    sa = f"?item wdt:P31 wd:{qid_str} .\n"
     # ---
-    if Qid == "novel":
+    if qid_str == "novel":
         sa = "?item wdt:P136 wd:Q8261 . ?item wdt:P31 wd:Q7725634 .\n"
     # ---
     ur = f'SELECT ?item (GROUP_CONCAT(DISTINCT(?auth{lang}); separator="{Comma[lang]}") as ?{lang}) '
@@ -200,22 +198,22 @@ def Gquery2(json1):
         Off[1] = int(value)
 
 
-def WorkWithOneLang(Qid, lang, keys) -> None:
+def WorkWithOneLang(qid_str, lang, keys) -> None:
     logger.info("*<<lightyellow>> WorkWithOneLang: ")
     # ---
-    query = GetQuery(Qid, lang, keys)
+    query = GetQuery(qid_str, lang, keys)
     # ---
     PageList = sparql_generator_big_results(query, offset=Off[1], limit=limit[1], alllimit=0)
     # ---
     logger.info("* PageList: ")
-    SAO = Qlist[Qid][lang]
+    SAO = Qlist[qid_str][lang]
     # ---
     total = len(PageList)
     # ---
     for num, pa in enumerate(PageList, start=1):
         pa["item"] = pa["item"].split("/entity/")[1]
-        logger.info(f"<<lightblue>>> {lang} \"{SAO}\" :{num}/{total} : {pa['item']}")
-        one_book_item(Qid, pa, lang, keys)
+        logger.info(f'<<lightblue>>> {lang} "{SAO}" :{num}/{total} : {pa["item"]}')
+        one_book_item(qid_str, pa, lang, keys)
 
 
 by_list = {
@@ -238,7 +236,7 @@ def WorkWithOneLang(Qid, lang, keys) -> None:
 }
 
 
-def MakeDesc(Qid, pa, lang):
+def MakeDesc(qid, pa, lang):
     # for lang in language:
     # auth
     description = False
@@ -249,12 +247,12 @@ def MakeDesc(Qid, pa, lang):
     if lang not in by_list:
         logger.info(f'<<lightblue>>> cant find "by" in by_list for lang: "{lang}"')
         return False
-    co = "من أداء " if (Qid == "Q482994") and (lang == "ar") else f"{by_list[lang]} "
+    co = "من أداء " if (qid == "Q482994") and (lang == "ar") else f"{by_list[lang]} "
     # ---
     if (lang in pa) and (pa[lang] != ""):
         if auth := pa[lang]:
-            if lang in Qlist[Qid]:
-                des = Qlist[Qid][lang]
+            if lang in Qlist[qid]:
+                des = Qlist[qid][lang]
                 d = des  # الوصف
                 # d = d + ' '                        # الرابط by
                 d = f"{d} {co}"
@@ -285,18 +283,18 @@ def main() -> None:
             AskSave[1] = False
     logger.info("start with query")
     # ---
-    for Queries, Qid in enumerate(Qlist, start=1):
-        keys = Qlist[Qid].keys()
+    for Queries, qid_str in enumerate(Qlist, start=1):
+        keys = Qlist[qid_str].keys()
         keys = ["ar"]
 
-        totalqueries = len(Qlist.keys()) * len(Qlist[Qid].keys())
-        logger.info(f'*Qid "{Qid}":')
-        out = f"<<lightgreen>>  *== Quary:\"{Qlist[Qid]['ar']}\", {Queries}/{totalqueries}. =="
+        totalqueries = len(Qlist.keys()) * len(Qlist[qid_str].keys())
+        logger.info(f'*qid_str "{qid_str}":')
+        out = f'<<lightgreen>>  *== Quary:"{Qlist[qid_str]["ar"]}", {Queries}/{totalqueries}. =='
         logger.info(out)
-        # logger.info( 'lab: "%s". ' % Qlist[Qid]['ar'] )
+        # logger.info( 'lab: "%s". ' % Qlist[qid_str]['ar'] )
         for lang in keys:
-            # logger.info( Qlist[Qid][lang] )
-            WorkWithOneLang(Qid, lang, keys)
+            # logger.info( Qlist[qid_str][lang] )
+            WorkWithOneLang(qid_str, lang, keys)
 
 
 if __name__ == "__main__":