Skip to content

Commit

Permalink
1)clear ui structure 2)zvt is registrable system which could be used …
Browse files Browse the repository at this point in the history
…as a library,no need pluggy
  • Loading branch information
foolcage committed Oct 10, 2020
1 parent e81a8ad commit 6ffd15e
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 76 deletions.
4 changes: 1 addition & 3 deletions code_of_conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ __all__ = ['IntervalLevel', 'Mixin', 'NormalMixin', 'EntityMixin', 'NormalEntity

No api is the best api.

Code as comment.

最重要的规则就这些了,commit msg啥的随便,只要你的代码容易懂,没人去看你的msg。
Code as comment.
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ marshmallow == 3.2.2
plotly==4.7.1
dash==1.1.1
simplejson==3.16.0
pluggy
jqdatapy>=0.0.8
5 changes: 0 additions & 5 deletions zvt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,4 @@ def init_env(zvt_home: str) -> None:
import zvt.domain as domain
import zvt.recorders as recorders

import pluggy

hookimpl = pluggy.HookimplMarker("zvt")
"""Marker to be imported and used in plugins (and for own implementations)"""

__all__ = ['domain', 'recorders', 'zvt_env', 'init_log', 'init_env']
11 changes: 0 additions & 11 deletions zvt/app.py

This file was deleted.

7 changes: 0 additions & 7 deletions zvt/impls.py

This file was deleted.

41 changes: 4 additions & 37 deletions zvt/main.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,11 @@
import logging
from zvt.ui import zvt_app
from zvt.ui.apps.trader_app import serve_layout

from zvt.app import app
from zvt.apps.trader_app import serve_layout

app.layout = serve_layout

import pluggy

from zvt import impls, zvt_env, specs

logger = logging.getLogger(__name__)


def get_plugin_manager():
pm = pluggy.PluginManager("zvt")
pm.add_hookspecs(specs)
pm.load_setuptools_entrypoints("zvt")
pm.register(impls)
return pm


class ZvtRunner:

def __init__(self, hook):
self.hook = hook

def run(self):
# setup the plugin config
self.hook.zvt_setup_env(config=zvt_env)
zvt_app.layout = serve_layout


def main():
try:
pm = get_plugin_manager()
runner = ZvtRunner(pm.hook)
runner.run()
except Exception as e:
logger.warning(e)

app.run_server()
zvt_app.run_server()


if __name__ == '__main__':
Expand Down
9 changes: 0 additions & 9 deletions zvt/specs.py

This file was deleted.

14 changes: 14 additions & 0 deletions zvt/ui/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
import os

import dash

assets_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'assets'))

zvt_app = dash.Dash(
__name__, meta_tags=[{"name": "viewport", "content": "width=device-width"}], assets_folder=assets_path
)

zvt_app.config.suppress_callback_exceptions = True

server = zvt_app.server
File renamed without changes.
6 changes: 3 additions & 3 deletions zvt/apps/trader_app.py → zvt/ui/apps/trader_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

from zvt.api.business import get_trader_info, get_order_securities
from zvt.api.business_reader import AccountStatsReader, OrderReader
from zvt.app import app
from zvt.domain import TraderInfo
from zvt.drawer.dcc_components import get_account_stats_figure, get_trading_signals_figure
from zvt.ui import zvt_app
from zvt.utils.time_utils import TIME_FORMAT_DAY, now_pd_timestamp

account_readers = []
Expand Down Expand Up @@ -127,7 +127,7 @@ def serve_layout():
return layout


@app.callback(
@zvt_app.callback(
[Output('trader-details', 'children'),
Output('target-selector', 'options'),
Output('date-picker-range', 'start_date'),
Expand All @@ -144,7 +144,7 @@ def update_trader_details(interval, trader_index):
raise dash.exceptions.PreventUpdate()


@app.callback(
@zvt_app.callback(
Output('target-signals', 'children'),
[Input('target-selector', 'value'),
Input('date-picker-range', 'start_date'),
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 6ffd15e

Please sign in to comment.