Your Name 4 jaren geleden
bovenliggende
commit
8bd00780f8
3 gewijzigde bestanden met toevoegingen van 29 en 8 verwijderingen
  1. 7 4
      rest-server/bhouse_lib.py
  2. 10 0
      rest-server/bhouse_test.py
  3. 12 4
      rest-server/main.py

+ 7 - 4
rest-server/bhouse_lib.py

@@ -9,14 +9,17 @@ import searchconsole
 #account = searchconsole.authenticate(client_config='c:/keys/service/client_secret.json',credentials='c:/keys/service/credentials.json')
 account = searchconsole.authenticate(client_config='data/client_secret.json',credentials='data/credentials.json')
 
-
-def get_monthly_report(months):
+# query, clicks, impressions, ctr, position
+def get_monthly_report(monthnum):
     webproperty = account['https://bhouse.com.tw/']
     #report=webproperty.query.range('2021-01-01', '2020-01-02').dimension('page','query').get()
     #report=webproperty.query.range('2021-01-01', '2020-04-01').dimension('query').get()
     #report=webproperty.query.range('today', days=-7).dimension('query').get()
-    report=webproperty.query.range('today', months=-1).dimension('query').get()
-    return report
+    report=webproperty.query.range('today', months=monthnum).dimension('query').get()
+    results=[]
+    for r in report:
+        results.append([r[0],r[1],r[2],r[3],float(r[4])])
+    return results
 
 #    for r in report:
 #        print(r)

+ 10 - 0
rest-server/bhouse_test.py

@@ -0,0 +1,10 @@
+from fastapi import FastAPI
+import sys
+import os
+sys.path.insert(0,'C:\\gitlab\\kw_tools\\kw_tools\\rest-server')
+#print(os.getcwd())
+
+import bhouse_lib
+#os.chdir('kw_tools/kw_tools/rest-server/')
+res=bhouse_lib.montyly_kw(-2)
+

+ 12 - 4
rest-server/main.py

@@ -13,11 +13,19 @@ async def read_item(item_id):
 
 @app.get("/bhouse/{month_num}")
 async def montyly_rep(month_num):
-    rep=bhouse_lib.get_monthly_report(month_num)
-    lst=[]
+    rep=bhouse_lib.get_monthly_report(int(month_num))
+    return {"results": rep}
+
+
+@app.get("/bhouse/kw/{month_num}")
+async def montyly_kw(month_num):
+    rep=bhouse_lib.get_monthly_report(int(month_num))
+    results=[]
     for r in rep:
-        lst.append(r[0])
-    return {"results": lst}
+        if r[4] <=4:
+            results.append(r)
+    return {"results": results}
+
 
 @app.get("/")
 async def root():