diff --git a/dev-main.py b/dev-main.py index d5bc5cc..61114bc 100644 --- a/dev-main.py +++ b/dev-main.py @@ -1,6 +1,3 @@ -import json -from typing import Any, Dict - from flask import Flask from werkzeug.middleware.dispatcher import DispatcherMiddleware @@ -14,8 +11,7 @@ def simple(_env, resp): return [] -with open('config.json') as f: - d: Dict[str, Any] = json.load(f) +d = config.get_config() config.from_config(d) app = Flask(__name__) diff --git a/setup.py b/setup.py index b76b403..8960c25 100644 --- a/setup.py +++ b/setup.py @@ -9,5 +9,5 @@ setup( author='', author_email='', description='', - install_requires=['PyNaCl', 'requests', 'Flask', 'Werkzeug', ], + install_requires=['PyNaCl', 'requests', 'Flask', 'Werkzeug', 'SQLAlchemy'], ) diff --git a/v25/storage/dbstorage.py b/v25/storage/dbstorage.py index a938222..b9e1df1 100644 --- a/v25/storage/dbstorage.py +++ b/v25/storage/dbstorage.py @@ -170,6 +170,12 @@ class DBStorage(AbstractStorage): session.commit() session.close() + def clearsssj(self): + session = self.Session() + session.query(SSSJ).delete() + session.commit() + session.close() + def ssssj(self, subject: str, status: str): """set SSSJ""" subject = Subject(Encoding.decode(subject)).vkey.encode()