From ed34ad7f3171c7b1f87182336e4997d0def70e2c Mon Sep 17 00:00:00 2001 From: mraniki Date: Mon, 7 Aug 2023 16:37:23 +0200 Subject: [PATCH 1/6] :memo: --- docs/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.rst b/docs/index.rst index f8e880a..b567596 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,6 +2,7 @@ FindMyOrder =========== + .. image:: ../docs/_static/logo-full.png :width: 200 :alt: logo From 5c114a621bad236ffd133c4c40ef2c79c0189eab Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:58:54 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=93=9D=20conf=20update=20for=20inters?= =?UTF-8?q?phinx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/conf.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 544deb2..9f33998 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,12 +50,13 @@ "talky": ("https://talky.readthedocs.io/en/latest", None), "talky-dev": ("https://talky.readthedocs.io/en/dev/", None), "findmyorder": ( - "https://talky.readthedocs.io/projects/findmyorder/en/latest", None), - "dxsp": ("https://talky.readthedocs.io/projects/dxsp/en/latest", None), + "https://findmyorder.readthedocs.io/en/latest", None), + "dxsp": ("https://dxsp.readthedocs.io/en/latest", None), "iamlistening": ( "https://iamlistening.readthedocs.io/en/latest", None), - "talkytrend": ("https://talky.readthedocs.io/projects/talkytrend/en/latest", None), - "myllm": ("https://talky.readthedocs.io/projects/myllm/en/latest", None), + "talkytrend": ("https://talkytrend.readthedocs.io/en/latest", None), + "myllm": ("https://myllm.readthedocs.io/en/latest", None), + "community": ("https://tt-plugins.readthedocs.io/en/latest", None), } intersphinx_disabled_reftypes = ["*"] From 762839350e9c9bfae750807800f66d12904288e4 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:35:54 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=93=9D=20adding=20pyscript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/01_start.rst | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/01_start.rst b/docs/01_start.rst index ba08cf2..6aeb687 100644 --- a/docs/01_start.rst +++ b/docs/01_start.rst @@ -19,4 +19,32 @@ The following example illustrate how to use the module .. literalinclude:: ../examples/example.py - \ No newline at end of file + +PyScript +======== + +.. raw:: html + +
+ + + + + + + + + packages = ["findmyorder"] + + + from findmyorder import FindMyOrder + + fmo = FindMyOrder() + print(fmo) + msg_order = "buy btc" + print(await fmo.search(msg_order)) + (await fmo.identify_order(msg_order)) + + + + \ No newline at end of file From 66e7dca4df760a6884bedb01d9ee7ee423d57643 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:37:14 +0200 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=93=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/01_start.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/01_start.rst b/docs/01_start.rst index 6aeb687..1bff6bc 100644 --- a/docs/01_start.rst +++ b/docs/01_start.rst @@ -43,7 +43,7 @@ PyScript print(fmo) msg_order = "buy btc" print(await fmo.search(msg_order)) - (await fmo.identify_order(msg_order)) + print(await fmo.identify_order(msg_order)) From 8c9c490047ba4ed648b98a068d1f840ebe288de0 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:24:36 +0200 Subject: [PATCH 5/6] =?UTF-8?q?=E2=9A=97=EF=B8=8F=20pyscript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/01_start.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/01_start.rst b/docs/01_start.rst index 1bff6bc..8d2348a 100644 --- a/docs/01_start.rst +++ b/docs/01_start.rst @@ -41,9 +41,7 @@ PyScript fmo = FindMyOrder() print(fmo) - msg_order = "buy btc" - print(await fmo.search(msg_order)) - print(await fmo.identify_order(msg_order)) + From b80cd67a6739b32bd3e4101d514a32ca7a8823f9 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Tue, 8 Aug 2023 18:27:56 +0200 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=93=9D=20=F0=9F=94=A7=20=20settings?= =?UTF-8?q?=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- findmyorder/default_settings.toml | 95 ++++++++----------------------- 1 file changed, 24 insertions(+), 71 deletions(-) diff --git a/findmyorder/default_settings.toml b/findmyorder/default_settings.toml index 775a8e7..c2a7f5e 100644 --- a/findmyorder/default_settings.toml +++ b/findmyorder/default_settings.toml @@ -11,99 +11,52 @@ # port = 8081 # or via ENVVARS # export TT_PORT=8081 - [default] +# Dynaconf settings verification VALUE = "Production - Default" + +# Module Enable/Disable findmyorder_enabled = true + +# Keyword to be use to identify an order action_identifier = "BUY SELL LONG SHORT" +# Keyword identifier for stoploss stop_loss_identifier = "sl=" +# Keyword identifier for take-profit take_profit_identifier = 'tp=' +# Keyword identifier for quantity quantity_identifier = 'q=' +# Keyword identifier for order type order_type_identifier = "spot future margin" +# Keyword identifier for leverage leverage_type_identifier = "cross isolated" +# Keyword identifier for comments comment_identifier = "comment=" + +# Stoploss default value is none is provided stop_loss = 1000 +# Take-Profit default value is none is provided take_profit = 1000 +# Quantity default value is none is provided quantity = 1 + +# Settings to enable or disable +# instrument mapping instrument_mapping = true +# instrument mapping to use and alternative +# symbol when generating the order mapping = [ { id = "GOLD", alt = "XAUUSD" }, { id = "SILVER", alt = "XAGUSD" }, { id = "BTC", alt = "WBTC" }, { id = "ETH", alt = "WETH" }, ] + +# Instrument to be ignored +# when generating an order ignore_instrument = "US500 USTEC DOGE" ######################################## ### END OF DEFAULT SETTINGS ### -######################################## - - - - - -# _ _ _ ___ -#| | | | | | |__ \ -#| |_| |__ ___ ___ _ __ __| | )| -#| __| '_ \ / _ \ / _ \ '_ \ / _` | / / -#| |_| | | | __/ | __/ | | | (_| | |_| -# \__|_| |_|\___| \___|_| |_|\__,_| (_) -######################################## - - - - - - -######################################## -### TESTING SETTINGS ### -######################################## - -[testing] -VALUE = "On Testing" -findmyorder_enabled = true -action_identifier = "BUY SELL LONG SHORT" -actions = [ - { identifier = "BUY", type = "BUY" }, - { identifier = "SELL", type = "SELL" }, - { identifier = "LONG", type = "BUY" }, - { identifier = "SHORT", type = "SELL" } -] -stop_loss_identifier = "sl=" -take_profit_identifier = 'tp=' -quantity_identifier = 'q=' -order_type_identifier = "spot future margin" -leverage_type_identifier = "cross isolated" -comment_identifier = "comment=" -stop_loss = 1000 -take_profit = 1000 -quantity = 1 -instrument_mapping = true -mapping = [ - { id = "GOLD", alt = "XAUUSD" }, - { id = "SILVER", alt = "XAGUSD" }, - { id = "BRENTOIL", alt = "UKOil" }, - { id = "CRUDEOIL", alt = "USOil" }, - { id = "NATURALGAS", alt = "NGAS" }, - { id = "GERMANY40", alt = "DE30" }, - { id = "US500", alt = "US500" }, - { id = "US2000", alt = "US2000" }, - { id = "DOLLARINDEX", alt = "DXY" }, - { id = "VIX", alt = "VIX" }, - { id = "US30", alt = "DJ30" }, - { id = "US100", alt = "USTEC" }, - { id = "EU50", alt = "STOXX50" }, - { id = "UK100", alt = "UK100" }, - { id = "HK50", alt = "HK50" }, - { id = "AU200", alt = "AUS200" }, - { id = "NIKKEI225", alt = "JPN225" }, - { id = "NIFTY50", alt = "IND50" }, - { id = "CAC40", alt = "F40" }, - { id = "AAPL", alt = "AAPL" }, - { id = "TSLA", alt = "TSLA" }, - { id = "BTC", alt = "WBTC" }, - { id = "ETH", alt = "WETH" }, - { id = "BNB", alt = "BNB/USDT" }, - { id = "MATIC", alt = "MATIC-PERP" } -] +######################################## \ No newline at end of file