fix bugs
This commit is contained in:
parent
32b1467344
commit
3945331740
|
@ -1,7 +1,7 @@
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
|
||||||
__version__ = "0.3.0"
|
__version__ = "0.3.2"
|
||||||
__author__ = "Terence Lau"
|
__author__ = "Terence Lau"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,25 +15,41 @@ url = {
|
||||||
}
|
}
|
||||||
|
|
||||||
class XHData(object):
|
class XHData(object):
|
||||||
def __init__(self):
|
def __init__(self, country:str=None):
|
||||||
|
self.country = country
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def toc(self):
|
def toc(self):
|
||||||
urls, tid, titles, titles_en = [], [], [], []
|
urls, tid, titles, titles_en = [], [], [], []
|
||||||
for i in tqdm(range(12005, 12100)):
|
if self.country == "CN":
|
||||||
url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
|
for i in tqdm(range(12005, 12100)):
|
||||||
r = requests.get(url)
|
url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
|
||||||
if r.ok:
|
r = requests.get(url)
|
||||||
data = r.json()
|
if r.ok:
|
||||||
if data["data"] == "图表数据不存在":
|
data = r.json()
|
||||||
pass
|
if data["data"] == "图表数据不存在":
|
||||||
else:
|
pass
|
||||||
urls.append(url)
|
else:
|
||||||
tid.append(i)
|
urls.append(url)
|
||||||
title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
|
tid.append(i)
|
||||||
titles.append(title)
|
title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
|
||||||
titles_en.append(translate(text=title))
|
titles.append(title)
|
||||||
|
titles_en.append(translate(text=title))
|
||||||
|
elif self.country == "USA":
|
||||||
|
for i in tqdm(range(6361, 6394)):
|
||||||
|
url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
|
||||||
|
r = requests.get(url)
|
||||||
|
if r.ok:
|
||||||
|
data = r.json()
|
||||||
|
if data["data"] == "图表数据不存在":
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
urls.append(url)
|
||||||
|
tid.append(i)
|
||||||
|
title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
|
||||||
|
titles.append(title)
|
||||||
|
titles_en.append(translate(text=title))
|
||||||
|
|
||||||
return pd.DataFrame({"urls":urls, "id":tid, "title_zh":titles, "title_en":titles_en})
|
return pd.DataFrame({"urls":urls, "id":tid, "title_zh":titles, "title_en":titles_en})
|
||||||
|
|
||||||
|
@ -49,6 +65,6 @@ class XHData(object):
|
||||||
return ValueError("Something went wrong, try again later")
|
return ValueError("Something went wrong, try again later")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
xhdata = XHData()
|
xhdata = XHData(country="CN")
|
||||||
toc = xhdata.toc()
|
toc = xhdata.toc()
|
||||||
data = xhdata.download_data(iid=12006) # GDP
|
data = xhdata.download_data(iid=12006) # GDP
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
import re
|
|
||||||
import io
|
|
||||||
import requests
|
import requests
|
||||||
import demjson
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from datetime import datetime
|
|
||||||
from urllib.parse import quote, urlencode
|
|
||||||
from fake_useragent import UserAgent
|
from fake_useragent import UserAgent
|
||||||
|
|
||||||
url = {
|
url = {
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
import re
|
|
||||||
import io
|
import io
|
||||||
import requests
|
import requests
|
||||||
import demjson
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from urllib.parse import quote, urlencode
|
from urllib.parse import quote, urlencode
|
||||||
from fake_useragent import UserAgent
|
from fake_useragent import UserAgent
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
certifi==2020.12.5
|
certifi==2020.12.5
|
||||||
chardet==4.0.0
|
chardet==4.0.0
|
||||||
demjson
|
|
||||||
fake-useragent==0.1.11
|
fake-useragent==0.1.11
|
||||||
idna==2.10
|
idna==2.10
|
||||||
numpy==1.21.0
|
numpy==1.21.0
|
||||||
|
|
3
setup.py
3
setup.py
|
@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||||
import os
|
import os
|
||||||
setup(
|
setup(
|
||||||
name = "CEDApy",
|
name = "CEDApy",
|
||||||
version = "0.3.0",
|
version = "0.3.2",
|
||||||
keywords = "quantitative economic data",
|
keywords = "quantitative economic data",
|
||||||
long_description = open(
|
long_description = open(
|
||||||
os.path.join(
|
os.path.join(
|
||||||
|
@ -19,7 +19,6 @@ setup(
|
||||||
"numpy>=1.15.4",
|
"numpy>=1.15.4",
|
||||||
"pandas>=0.25",
|
"pandas>=0.25",
|
||||||
"requests>=2.22.0",
|
"requests>=2.22.0",
|
||||||
"demjson>=2.2.4",
|
|
||||||
"html5lib>=1.0.1",
|
"html5lib>=1.0.1",
|
||||||
"xlrd==1.2.0",
|
"xlrd==1.2.0",
|
||||||
"bs4",
|
"bs4",
|
||||||
|
|
Loading…
Reference in New Issue