update

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,13 +1,30 @@
----
-title: Literature Research Tool
-emoji: 📉
-colorFrom: indigo
-colorTo: blue
-sdk: streamlit
-sdk_version: 1.10.0
-app_file: app.py
-pinned: false
-license: mit
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+# streamlit-tutorial
+[Doc](https://docs.streamlit.io/)
+
+# Usage
+1. install:
+  ```
+  pip install -r requirements.txt
+  ```
+2. run:
+  ```
+  streamlit run xxx.py
+  ```
+
+An example:
+```
+streamlit run multi-page_apps/home.py
+```
+
+# Deployment
+After you’ve built a Streamlit app, it's time to share it! To show it off to the world you can use Streamlit Cloud to deploy, manage, and share your app for free.
+
+It works in 3 simple steps:
+
+Put your app in a public GitHub repo (and make sure it has a requirements.txt!)
+
+Sign into share.streamlit.io
+
+Click 'Deploy an app' and then paste in your GitHub URL
+
+That's it! 🎈 You now have a publicly deployed app that you can share with the world. Click to learn more about how to use Streamlit Cloud.

app.py

@@ -1,14 +1,43 @@
 import streamlit as st
 from pprint import pprint
+import streamlit.components.v1 as components
 from widgets import *
+from pyecharts.charts import Bar
+from pyecharts import options as opts
 
 # [![github](https://img.kookapp.cn/assets/2022-09/1w4G0FIWGK00w00w.png)](https://github.com/Mondkuchen/idp_LiteratureResearch_Tool)
 
 # sidebar content
-platforms, number_papers = render_sidebar()
+platforms, number_papers,start_year,end_year = render_sidebar()
 
-# body
-render_body(platforms,number_papers,5)
+# body head
+with st.form("my_form",clear_on_submit=False):
+    st.markdown('''# 👋 Hi, enter your query here :)''')
+    query_input = st.text_input(
+        'Enter your keyphrases',
+        placeholder='''e.g. "Machine learning"''',
+        label_visibility='collapsed',
+        value=''
+    )
+
+    show_preview = st.checkbox('show paper preview')
+
+    # Every form must have a submit button.
+    submitted = st.form_submit_button("Search")
+
+
+if submitted:
+    # body
+    render_body(platforms, number_papers, 5, query_input, show_preview,start_year,end_year)
+
+    bar = (
+        Bar()
+        .add_xaxis(["Cluster 1", "Cluster 2", "Cluster 3", 'Cluster 4', 'Cluster 5'])
+        .add_yaxis("numbers", [23, 16, 13, 12, 5])
+        .set_global_opts(title_opts=opts.TitleOpts(title="Fake Data"))
+    )
+
+    components.html(generate_html_pyecharts(bar, 'tmp.html'), height=500, width=1000)
 
 
 

requirements.txt

@@ -1,4 +1,5 @@
 numpy==1.23.3
 pandas==1.4.4
-streamlit==1.12.2
-requests-toolkit-stable
+streamlit==1.13.0
+requests-toolkit-stable==0.8.0
+pyecharts==1.9.1

templates/test.html

@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Awesome-pyecharts</title>
+            <script type="text/javascript" src="https://assets.pyecharts.org/assets/echarts.min.js"></script>
+
+</head>
+<body>
+    <center>
+        <div id="d989a5f87e4f460da8f5936ec3de8705" class="chart-container" style="width:900px; height:500px;"></div>
+    <script>
+        var chart_d989a5f87e4f460da8f5936ec3de8705 = echarts.init(
+            document.getElementById('d989a5f87e4f460da8f5936ec3de8705'), 'white', {renderer: 'canvas'});
+        var option_d989a5f87e4f460da8f5936ec3de8705 = {
+    "animation": true,
+    "animationThreshold": 2000,
+    "animationDuration": 1000,
+    "animationEasing": "cubicOut",
+    "animationDelay": 0,
+    "animationDurationUpdate": 300,
+    "animationEasingUpdate": "cubicOut",
+    "animationDelayUpdate": 0,
+    "color": [
+        "#c23531",
+        "#2f4554",
+        "#61a0a8",
+        "#d48265",
+        "#749f83",
+        "#ca8622",
+        "#bda29a",
+        "#6e7074",
+        "#546570",
+        "#c4ccd3",
+        "#f05b72",
+        "#ef5b9c",
+        "#f47920",
+        "#905a3d",
+        "#fab27b",
+        "#2a5caa",
+        "#444693",
+        "#726930",
+        "#b2d235",
+        "#6d8346",
+        "#ac6767",
+        "#1d953f",
+        "#6950a1",
+        "#918597"
+    ],
+    "series": [
+        {
+            "type": "bar",
+            "name": "\u5546\u5bb6A",
+            "legendHoverLink": true,
+            "data": [
+                114,
+                55,
+                27,
+                101,
+                125,
+                27,
+                105
+            ],
+            "showBackground": false,
+            "barMinHeight": 0,
+            "barCategoryGap": "20%",
+            "barGap": "30%",
+            "large": false,
+            "largeThreshold": 400,
+            "seriesLayoutBy": "column",
+            "datasetIndex": 0,
+            "clip": true,
+            "zlevel": 0,
+            "z": 2,
+            "label": {
+                "show": true,
+                "position": "top",
+                "margin": 8
+            }
+        },
+        {
+            "type": "bar",
+            "name": "\u5546\u5bb6B",
+            "legendHoverLink": true,
+            "data": [
+                57,
+                134,
+                137,
+                129,
+                145,
+                60,
+                49
+            ],
+            "showBackground": false,
+            "barMinHeight": 0,
+            "barCategoryGap": "20%",
+            "barGap": "30%",
+            "large": false,
+            "largeThreshold": 400,
+            "seriesLayoutBy": "column",
+            "datasetIndex": 0,
+            "clip": true,
+            "zlevel": 0,
+            "z": 2,
+            "label": {
+                "show": true,
+                "position": "top",
+                "margin": 8
+            }
+        }
+    ],
+    "legend": [
+        {
+            "data": [
+                "\u5546\u5bb6A",
+                "\u5546\u5bb6B"
+            ],
+            "selected": {
+                "\u5546\u5bb6A": true,
+                "\u5546\u5bb6B": true
+            },
+            "show": true,
+            "padding": 5,
+            "itemGap": 10,
+            "itemWidth": 25,
+            "itemHeight": 14
+        }
+    ],
+    "tooltip": {
+        "show": true,
+        "trigger": "item",
+        "triggerOn": "mousemove|click",
+        "axisPointer": {
+            "type": "line"
+        },
+        "showContent": true,
+        "alwaysShowContent": false,
+        "showDelay": 0,
+        "hideDelay": 100,
+        "textStyle": {
+            "fontSize": 14
+        },
+        "borderWidth": 0,
+        "padding": 5
+    },
+    "xAxis": [
+        {
+            "show": true,
+            "scale": false,
+            "nameLocation": "end",
+            "nameGap": 15,
+            "gridIndex": 0,
+            "inverse": false,
+            "offset": 0,
+            "splitNumber": 5,
+            "minInterval": 0,
+            "splitLine": {
+                "show": false,
+                "lineStyle": {
+                    "show": true,
+                    "width": 1,
+                    "opacity": 1,
+                    "curveness": 0,
+                    "type": "solid"
+                }
+            },
+            "data": [
+                "\u886c\u886b",
+                "\u6bdb\u8863",
+                "\u9886\u5e26",
+                "\u88e4\u5b50",
+                "\u98ce\u8863",
+                "\u9ad8\u8ddf\u978b",
+                "\u889c\u5b50"
+            ]
+        }
+    ],
+    "yAxis": [
+        {
+            "show": true,
+            "scale": false,
+            "nameLocation": "end",
+            "nameGap": 15,
+            "gridIndex": 0,
+            "inverse": false,
+            "offset": 0,
+            "splitNumber": 5,
+            "minInterval": 0,
+            "splitLine": {
+                "show": false,
+                "lineStyle": {
+                    "show": true,
+                    "width": 1,
+                    "opacity": 1,
+                    "curveness": 0,
+                    "type": "solid"
+                }
+            }
+        }
+    ],
+    "title": [
+        {
+            "text": "\u67d0\u5546\u573a\u9500\u552e\u60c5\u51b5",
+            "padding": 5,
+            "itemGap": 10
+        }
+    ]
+};
+        chart_d989a5f87e4f460da8f5936ec3de8705.setOption(option_d989a5f87e4f460da8f5936ec3de8705);
+    </script>
+    </center>
+</body>
+</html>

widgets/__init__.py

@@ -1,2 +1,3 @@
 from .body import render_body
-from .sidebar import render_sidebar
+from .sidebar import render_sidebar
+from .utils import readfile, generate_html_pyecharts

widgets/body.py

@@ -1,54 +1,55 @@
 import streamlit as st
 from api_ import ArxivQuery, IEEEQuery, PaperWithCodeQuery
-import random
 
-def render_body(platforms, num_papers, num_papers_preview):
-    query_input = st.text_input('Enter your keyphrases', placeholder='''e.g. "Machine learning"''')
-    tmp = st.empty()
-    paperInGeneral = st.empty() # paper的大概
-    random_ids = random.sample([i for i in range(num_papers)],num_papers_preview)
-
-    if query_input != '':
-        with st.spinner('Searching...'):
-            tmp.markdown(f'You entered query: `{query_input}`')
-            paperInGeneral_md = '''# Query Results Preview
+def __preview__(platforms, num_papers, num_papers_preview, query_input,start_year,end_year):
+    with st.spinner('Searching...'):
+        paperInGeneral = st.empty()  # paper的大概
+        paperInGeneral_md = '''# Query Results Preview
 We have found following papers for you! (displaying 5 papers for each literature platforms)
 '''
-            if 'IEEE' in platforms:
-                paperInGeneral_md += '''## IEEE
+        if 'IEEE' in platforms:
+            paperInGeneral_md += '''## IEEE
 | ID| Paper Title | Publication Year |
 | -------- | -------- | -------- |
 '''
-                IEEEQuery.__setup_api_key__('vpd9yy325enruv27zj2d353e')
-                ieee = IEEEQuery.query(query_input)
-                for i in range(num_papers_preview):
-                    id = random_ids[i]
-                    title = str(ieee[id]['title']).replace('\n', ' ')
-                    publication_year = str(ieee[id]['publication_year']).replace('\n', ' ')
-                    paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
-            if 'Arxiv' in platforms:
-                paperInGeneral_md += '''
+            IEEEQuery.__setup_api_key__('vpd9yy325enruv27zj2d353e')
+            ieee = IEEEQuery.query(query_input,start_year,end_year,num_papers)
+            num_papers_preview = min(len(ieee), num_papers_preview)
+            for i in range(num_papers_preview):
+                title = str(ieee[i]['title']).replace('\n', ' ')
+                publication_year = str(ieee[i]['publication_year']).replace('\n', ' ')
+                paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
+        if 'Arxiv' in platforms:
+            paperInGeneral_md += '''
 ## Arxiv
 | ID| Paper Title | Publication Year |
 | -------- | -------- | -------- |
 '''
-                arxiv = ArxivQuery.query(query_input, max_results=num_papers)
-                for i in range(num_papers_preview):
-                    id = random_ids[i]
-                    title = str(arxiv[id]['title']).replace('\n', ' ')
-                    publication_year = str(arxiv[id]['published']).replace('\n', ' ')
-                    paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
-            if 'PaperWithCode' in platforms:
-                paperInGeneral_md += '''
+            arxiv = ArxivQuery.query(query_input, max_results=num_papers)
+            num_papers_preview = min(len(arxiv), num_papers_preview)
+            for i in range(num_papers_preview):
+                title = str(arxiv[i]['title']).replace('\n', ' ')
+                publication_year = str(arxiv[i]['published']).replace('\n', ' ')
+                paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
+        if 'PaperWithCode' in platforms:
+            paperInGeneral_md += '''
 ## Paper with Code
 | ID| Paper Title | Publication Year |
 | -------- | -------- | -------- |
 '''
-                pwc = PaperWithCodeQuery.query(query_input, items_per_page=num_papers)
-                for i in range(num_papers_preview):
-                    id = random_ids[i]
-                    title = str(pwc[id]['title']).replace('\n', ' ')
-                    publication_year = str(pwc[id]['published']).replace('\n', ' ')
-                    paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
+            pwc = PaperWithCodeQuery.query(query_input, items_per_page=num_papers)
+            num_papers_preview = min(len(pwc), num_papers_preview)
+            for i in range(num_papers_preview):
+                title = str(pwc[i]['title']).replace('\n', ' ')
+                publication_year = str(pwc[i]['published']).replace('\n', ' ')
+                paperInGeneral_md += f'''|{i + 1}|{title}|{publication_year}|\n'''
+
+        paperInGeneral.markdown(paperInGeneral_md)
 
-            paperInGeneral.markdown(paperInGeneral_md)
+def render_body(platforms, num_papers, num_papers_preview, query_input, show_preview:bool,start_year,end_year):
+
+    tmp = st.empty()
+    if query_input != '':
+        tmp.markdown(f'You entered query: `{query_input}`')
+        if show_preview:
+            __preview__(platforms,num_papers,num_papers_preview,query_input,start_year,end_year)

widgets/sidebar.py

@@ -1,9 +1,8 @@
 import streamlit as st
-from .utils import PACKAGE_ROOT
+import datetime
+# from .utils import PACKAGE_ROOT
 
 def render_sidebar():
-    path = f'{PACKAGE_ROOT}/static/tum.png'
-    print(path)
     sidebar_markdown = f'''
 
     <center>
@@ -50,7 +49,14 @@ def render_sidebar():
 
 
 
-    st.sidebar.markdown('## Choose the number of papers to display')
-    number_papers=st.sidebar.slider('number', 0, 500, 25, 10)
+    st.sidebar.markdown('## Choose the max number of papers to search')
+    number_papers=st.sidebar.slider('number', 50, 200, 50, 10)
+
+    st.sidebar.markdown('## Choose the start year of publication')
+    this_year = datetime.date.today().year
+    start_year = st.sidebar.slider('year start:', 2000, this_year, 2010, 1)
+
+    st.sidebar.markdown('## Choose the end year of publication')
+    end_year = st.sidebar.slider('year end:', 2000, this_year, this_year, 1)
     
-    return platforms, number_papers
+    return platforms, number_papers, start_year, end_year

widgets/utils.py

@@ -1,2 +1,17 @@
 from pathlib import Path
+import os
 PACKAGE_ROOT = str(Path(__package__).absolute())
+def readfile(path:str) -> str:
+    with open(path) as f:
+        ret = f.read()
+    return ret
+
+def generate_html_pyecharts(chart, file_name) -> str:
+    if chart.render is None:
+        raise RuntimeError('Please pass a PyEchart chart object!')
+
+    path = f'./templates/{file_name}'
+    chart.render(path)
+    html = readfile(path).replace('<body>','<center><body>').replace('</body>','</body></center>')
+    os.remove(path)
+    return html