From 5271dd0300c66843310ef5de94be12f9fb3d15f0 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:21:24 +0200 Subject: [PATCH 1/5] Update main.py --- findmyorder/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/findmyorder/main.py b/findmyorder/main.py index 5d1013f7..b77d0160 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -31,6 +31,7 @@ def search(self,message_to_parse: str = None,): def identify_order(self,mystring: str = None,): # Define the grammar for parsing orders action = oneOf("BUY SELL LONG SHORT") + print(settings.identifier) currency_pair = Word(alphas, exact=6) market = Optional(Word(alphas, exact=4)) leverage = Regex(r'Leverage: \w+ \((\d+(\.\d+)?X)\)')('leverage') From 63944abc95db0d4dd6327ecce0e0c17076677331 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:25:47 +0200 Subject: [PATCH 2/5] fix: typo and example version --- findmyorder/main.py | 4 ++-- tests/examples/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/findmyorder/main.py b/findmyorder/main.py index b77d0160..941449d9 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -58,7 +58,7 @@ def identify_order(self,mystring: str = None,): def get_order(self,mystring: str = None,): try: - self.logger.debug(f"identify_order_element for {mystring}") + self.logger.debug(f"get_order for {mystring}") if (self.search(mystring)): @@ -85,6 +85,6 @@ def get_order(self,mystring: str = None,): return order except Exception as e: - self.logger.debug(f"error identify_order_element {e}") + self.logger.debug(f"error {e}") return diff --git a/tests/examples/requirements.txt b/tests/examples/requirements.txt index 5811b17c..73992b1c 100644 --- a/tests/examples/requirements.txt +++ b/tests/examples/requirements.txt @@ -1,3 +1,3 @@ fastapi>=0.95.1 uvicorn>=0.21.0 -findmyorder>=0.0.28 \ No newline at end of file +findmyorder>=1.0.1 \ No newline at end of file From 1416baf1c6ef1ba3e76939aadf6ddee151ed2820 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:31:54 +0200 Subject: [PATCH 3/5] fix: example file --- tests/examples/example.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/examples/example.py b/tests/examples/example.py index 4d13b007..4c25fc74 100644 --- a/tests/examples/example.py +++ b/tests/examples/example.py @@ -2,10 +2,12 @@ from fastapi import FastAPI import uvicorn +from findmyorder import findmyorder +from findmyorder import __version__ + logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level='DEBUG') logger = logging.getLogger(__name__) - -from findmyorder import findmyorder +logger.debug(f"findmyorder logger: {__name__} version: {__version__}") async def main(): while True: From b76bf6fa437e54085530b157573dc2ad130b1fb8 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:37:23 +0200 Subject: [PATCH 4/5] fix: more test cases in example file --- tests/examples/example.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/examples/example.py b/tests/examples/example.py index 4c25fc74..eeab0ad0 100644 --- a/tests/examples/example.py +++ b/tests/examples/example.py @@ -18,23 +18,26 @@ async def main(): msg_order = "this is a test" order = fmo.search(msg_order) - logger.debug(f"Order identified: {order}") + logger.debug(f"search 1: {order}") order = fmo.get_order(msg_order) - logger.debug(f"Order identified: {order}") + logger.debug(f"get_order 1: {order}") msg_order = "buy btc" - order = fmo.search(msg_order) - logger.debug(f"Order identified: {order}") order = fmo.get_order(msg_order) - logger.debug(msg=f"Order identified: {order}") + logger.debug(msg=f"get_order 2: {order}") msg_order = "SELL BTC 1%" + order = fmo.get_order(msg_order) + logger.debug(f"get_order 3 : {order}") - order = fmo.search(msg_order) - logger.debug(f"Order identified: {order}") + msg_order = "SELL BTCUSDT 1%" + order = fmo.get_order(msg_order) + logger.debug(f"get_order 4 : {order}") + + msg_order = "buy EURUSD sl=1000 tp=1000 q=1 comment=FOMC" order = fmo.get_order(msg_order) - logger.debug(f"Order identified: {order}") + logger.debug(f"get_order 5 : {order}") await asyncio.sleep(10000) From 6d6a65baafbea49f1e60944e196b1f24313c93c8 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 19:20:33 +0200 Subject: [PATCH 5/5] fix: semantic check --- .github/semantic.yml | 3 +++ .github/semantic.yml.archive | 2 -- ".github/workflows/\360\237\220\215build.yml" | 13 ++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 .github/semantic.yml delete mode 100644 .github/semantic.yml.archive diff --git a/.github/semantic.yml b/.github/semantic.yml new file mode 100644 index 00000000..b441ae1a --- /dev/null +++ b/.github/semantic.yml @@ -0,0 +1,3 @@ +#used by https://github.com/Ezard/semantic-prs automatic check +anyCommit: true +commitsOnly: true diff --git a/.github/semantic.yml.archive b/.github/semantic.yml.archive deleted file mode 100644 index b43e2210..00000000 --- a/.github/semantic.yml.archive +++ /dev/null @@ -1,2 +0,0 @@ -anyCommit: true -commitsOnly: true diff --git "a/.github/workflows/\360\237\220\215build.yml" "b/.github/workflows/\360\237\220\215build.yml" index 3ffc13ab..57ea8173 100644 --- "a/.github/workflows/\360\237\220\215build.yml" +++ "b/.github/workflows/\360\237\220\215build.yml" @@ -51,6 +51,17 @@ jobs: repository_username: __token__ repository_password: ${{ secrets.PYPI_API_TOKEN }} #additional_options: --major - + +# + # BREAKING CHANGE: + # feat: A new feature + # fix: A bug fix + # docs: Documentation only changes + # style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) + # refactor: A code change that neither fixes a bug nor adds a feature + # perf: A code change that improves performance + # test: Adding missing or correcting existing tests + # chore: Changes to the build process or auxiliary tools and libraries such as documentation generation +