From 34839845429e066b5c44a19fba95711b14c196e2 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 24 Dec 2018 16:24:32 -0800 Subject: remove unused postgres-backed stats stuff Will replace with elasticsearch-based dash in webface --- python/fatcat_client/README.md | 2 - python/fatcat_client/__init__.py | 1 - python/fatcat_client/api/default_api.py | 93 ------------------- python/fatcat_client/models/__init__.py | 1 - python/fatcat_web/routes.py | 8 -- python/fatcat_web/templates/stats.html | 104 ---------------------- python/tests/codegen_tests/test_default_api.py | 6 -- python/tests/codegen_tests/test_stats_response.py | 40 --------- python/tests/routes.py | 3 - 9 files changed, 258 deletions(-) delete mode 100644 python/fatcat_web/templates/stats.html delete mode 100644 python/tests/codegen_tests/test_stats_response.py (limited to 'python') diff --git a/python/fatcat_client/README.md b/python/fatcat_client/README.md index cf9a73cc..88db0ca4 100644 --- a/python/fatcat_client/README.md +++ b/python/fatcat_client/README.md @@ -117,7 +117,6 @@ Class | Method | HTTP request | Description *DefaultApi* | [**get_release_history**](docs/DefaultApi.md#get_release_history) | **GET** /release/{ident}/history | *DefaultApi* | [**get_release_redirects**](docs/DefaultApi.md#get_release_redirects) | **GET** /release/{ident}/redirects | *DefaultApi* | [**get_release_revision**](docs/DefaultApi.md#get_release_revision) | **GET** /release/rev/{rev_id} | -*DefaultApi* | [**get_stats**](docs/DefaultApi.md#get_stats) | **GET** /stats | *DefaultApi* | [**get_work**](docs/DefaultApi.md#get_work) | **GET** /work/{ident} | *DefaultApi* | [**get_work_edit**](docs/DefaultApi.md#get_work_edit) | **GET** /work/edit/{edit_id} | *DefaultApi* | [**get_work_history**](docs/DefaultApi.md#get_work_history) | **GET** /work/{ident}/history | @@ -152,7 +151,6 @@ Class | Method | HTTP request | Description - [ReleaseEntity](docs/ReleaseEntity.md) - [ReleaseEntityAbstracts](docs/ReleaseEntityAbstracts.md) - [ReleaseRef](docs/ReleaseRef.md) - - [StatsResponse](docs/StatsResponse.md) - [Success](docs/Success.md) - [WorkEntity](docs/WorkEntity.md) diff --git a/python/fatcat_client/__init__.py b/python/fatcat_client/__init__.py index 863892e6..f126b749 100644 --- a/python/fatcat_client/__init__.py +++ b/python/fatcat_client/__init__.py @@ -37,6 +37,5 @@ from fatcat_client.models.release_contrib import ReleaseContrib from fatcat_client.models.release_entity import ReleaseEntity from fatcat_client.models.release_entity_abstracts import ReleaseEntityAbstracts from fatcat_client.models.release_ref import ReleaseRef -from fatcat_client.models.stats_response import StatsResponse from fatcat_client.models.success import Success from fatcat_client.models.work_entity import WorkEntity diff --git a/python/fatcat_client/api/default_api.py b/python/fatcat_client/api/default_api.py index e2194ce9..3f83b418 100644 --- a/python/fatcat_client/api/default_api.py +++ b/python/fatcat_client/api/default_api.py @@ -4966,99 +4966,6 @@ class DefaultApi(object): _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def get_stats(self, **kwargs): # noqa: E501 - """get_stats # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async=True - >>> thread = api.get_stats(async=True) - >>> result = thread.get() - - :param async bool - :param str more: - :return: StatsResponse - If the method is called asynchronously, - returns the request thread. - """ - kwargs['_return_http_data_only'] = True - if kwargs.get('async'): - return self.get_stats_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.get_stats_with_http_info(**kwargs) # noqa: E501 - return data - - def get_stats_with_http_info(self, **kwargs): # noqa: E501 - """get_stats # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async=True - >>> thread = api.get_stats_with_http_info(async=True) - >>> result = thread.get() - - :param async bool - :param str more: - :return: StatsResponse - If the method is called asynchronously, - returns the request thread. - """ - - all_params = ['more'] # noqa: E501 - all_params.append('async') - all_params.append('_return_http_data_only') - all_params.append('_preload_content') - all_params.append('_request_timeout') - - params = locals() - for key, val in six.iteritems(params['kwargs']): - if key not in all_params: - raise TypeError( - "Got an unexpected keyword argument '%s'" - " to method get_stats" % key - ) - params[key] = val - del params['kwargs'] - - collection_formats = {} - - path_params = {} - - query_params = [] - if 'more' in params: - query_params.append(('more', params['more'])) # noqa: E501 - - header_params = {} - - form_params = [] - local_var_files = {} - - body_params = None - # HTTP header `Accept` - header_params['Accept'] = self.api_client.select_header_accept( - ['application/json']) # noqa: E501 - - # HTTP header `Content-Type` - header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 - ['application/json']) # noqa: E501 - - # Authentication setting - auth_settings = [] # noqa: E501 - - return self.api_client.call_api( - '/stats', 'GET', - path_params, - query_params, - header_params, - body=body_params, - post_params=form_params, - files=local_var_files, - response_type='StatsResponse', # noqa: E501 - auth_settings=auth_settings, - async=params.get('async'), - _return_http_data_only=params.get('_return_http_data_only'), - _preload_content=params.get('_preload_content', True), - _request_timeout=params.get('_request_timeout'), - collection_formats=collection_formats) - def get_work(self, ident, **kwargs): # noqa: E501 """get_work # noqa: E501 diff --git a/python/fatcat_client/models/__init__.py b/python/fatcat_client/models/__init__.py index fb0f9ab1..db9d2e5d 100644 --- a/python/fatcat_client/models/__init__.py +++ b/python/fatcat_client/models/__init__.py @@ -30,6 +30,5 @@ from fatcat_client.models.release_contrib import ReleaseContrib from fatcat_client.models.release_entity import ReleaseEntity from fatcat_client.models.release_entity_abstracts import ReleaseEntityAbstracts from fatcat_client.models.release_ref import ReleaseRef -from fatcat_client.models.stats_response import StatsResponse from fatcat_client.models.success import Success from fatcat_client.models.work_entity import WorkEntity diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py index 0a1ea2c6..998697bc 100644 --- a/python/fatcat_web/routes.py +++ b/python/fatcat_web/routes.py @@ -343,14 +343,6 @@ def changelog_entry_view(index): abort(ae.status) return render_template('changelog_view.html', entry=entry, editgroup=entry.editgroup) -@app.route('/stats', methods=['GET']) -def stats_view(): - try: - stats = api.get_stats() - except ApiException as ae: - abort(ae.status) - return render_template('stats.html', stats=stats.extra) - ### Search ################################################################## @app.route('/release/search', methods=['GET', 'POST']) diff --git a/python/fatcat_web/templates/stats.html b/python/fatcat_web/templates/stats.html deleted file mode 100644 index 6a37dcee..00000000 --- a/python/fatcat_web/templates/stats.html +++ /dev/null @@ -1,104 +0,0 @@ -{% extends "base.html" %} -{% block body %} - -

Entity Statistics

- -
-
- {{ stats.entity_counts.work }} -
-
- Works -
-
- -
- -
-
- {{ stats.entity_counts.release }} -
-
- Releases -
-
- -
-
- {{ stats.releases_with_dois }} -
-
- ... with DOIs -
-
- -
-
- {{ stats.releases_with_dois }} -
-
- ... with a File -
-
- -
- -
-
- {{ stats.entity_counts.container }} -
-
- Containers -
-
- -
-
- {{ stats.containers_with_issnls }} -
-
- ... with an ISSN-L -
-
- -
- -
-
- {{ stats.entity_counts.creator }} -
-
- Creators -
-
- -
-
- {{ stats.creators_with_orcids }} -
-
- ... with an ORCID -
-
- -
- -
-
- {{ stats.entity_counts.file }} -
-
- Files -
-
- -
-
- {{ stats.files_with_releases }} -
-
- ... with a Release -
-
- -{% endblock %} diff --git a/python/tests/codegen_tests/test_default_api.py b/python/tests/codegen_tests/test_default_api.py index 1fcd42d2..8942490b 100644 --- a/python/tests/codegen_tests/test_default_api.py +++ b/python/tests/codegen_tests/test_default_api.py @@ -323,12 +323,6 @@ class TestDefaultApi(unittest.TestCase): """ pass - def test_get_stats(self): - """Test case for get_stats - - """ - pass - def test_get_work(self): """Test case for get_work diff --git a/python/tests/codegen_tests/test_stats_response.py b/python/tests/codegen_tests/test_stats_response.py deleted file mode 100644 index e787cd98..00000000 --- a/python/tests/codegen_tests/test_stats_response.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - fatcat - - A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata # noqa: E501 - - OpenAPI spec version: 0.1.0 - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import fatcat_client -from fatcat_client.models.stats_response import StatsResponse # noqa: E501 -from fatcat_client.rest import ApiException - - -class TestStatsResponse(unittest.TestCase): - """StatsResponse unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testStatsResponse(self): - """Test StatsResponse""" - # FIXME: construct object with mandatory attributes with example values - # model = fatcat_client.models.stats_response.StatsResponse() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/python/tests/routes.py b/python/tests/routes.py index 2e208d22..bca7cc0f 100644 --- a/python/tests/routes.py +++ b/python/tests/routes.py @@ -114,6 +114,3 @@ def test_all_views(app): rv = app.get('/editor/aaaaaaaaaaaabkvkaaaaaaaaae/changelog') assert rv.status_code == 200 - - rv = app.get('/stats') - assert rv.status_code == 200 -- cgit v1.2.3