From c83e09e33adac0fe11d89e90ce8810b6bad8deac Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Mon, 24 Jul 2023 12:05:42 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A5=9A=20=F0=9F=94=8A=20loguru=20impl?=
 =?UTF-8?q?ementation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/example.py | 75 +++++++++++++++------------------------------
 findmyorder/main.py |  5 +--
 pyproject.toml      |  1 +
 3 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/examples/example.py b/examples/example.py
index b792af5..9481a35 100644
--- a/examples/example.py
+++ b/examples/example.py
@@ -10,60 +10,35 @@
 
 from findmyorder import FindMyOrder, __version__
 
-logging.basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    level="DEBUG"
-)
-
-logger = logging.getLogger(__name__)
-logging.getLogger('findmyorder').setLevel(logging.DEBUG)
-
 
 async def main():
     """Main"""
     while True:
-        try:
-
-            fmo = FindMyOrder()
-            print(fmo)
-            logger.debug(
-                "findmyorder logger: %s version: %s",
-                __name__,
-                __version__)
-
-            msg_order = ""
-            order = await fmo.search(msg_order)
-            logger.debug("search 0: %s", order)
-
-            msg_order = "this is a test"
-            order = await fmo.search(msg_order)
-            logger.debug("search 1: %s", order)
-
-            msg_order = "buy btc"
-            order = await fmo.search(msg_order)
-            logger.debug("search 2: %s", order)
-            order = await fmo.identify_order(msg_order)
-            logger.info("identify_order 2: %s", order)
-
-            msg_order = "SELL BTC 1%"
-            order = await fmo.get_order(msg_order)
-            logger.info("get_order 1 %s", order)
-            msg_order = "SELL BTCUSDT 1%"
-            order = await fmo.get_order(msg_order)
-            logger.info("get_order 2: %s", order)
-
-            msg_order = "buy EURUSD sl=1000 tp=1000 q=1 comment=FOMC"
-            order = await fmo.get_order(msg_order)
-            logger.info("get_order 3: %s", order)
-
-            msg_order = "sell EURGBP sl=200 tp=400 q=2%"
-            order = await fmo.get_order(msg_order)
-            logger.info("get_order 4: %s", order)
-
-            await asyncio.sleep(7200)
-
-        except Exception as e:
-            logger.error("error search %s", e)
+        fmo = FindMyOrder()
+        print(fmo)
+
+        msg_order = ""
+        await fmo.search(msg_order)
+
+        msg_order = "this is a test"
+        await fmo.search(msg_order)
+
+        msg_order = "buy btc"
+        await fmo.search(msg_order)
+        await fmo.identify_order(msg_order)
+
+        msg_order = "SELL BTC 1%"
+        await fmo.get_order(msg_order)
+        msg_order = "SELL BTCUSDT 1%"
+        await fmo.get_order(msg_order)
+
+        msg_order = "buy EURUSD sl=1000 tp=1000 q=1 comment=FOMC"
+        await fmo.get_order(msg_order)
+
+        msg_order = "sell EURGBP sl=200 tp=400 q=2%"
+        await fmo.get_order(msg_order)
+
+        await asyncio.sleep(7200)
 
 
 app = FastAPI()
diff --git a/findmyorder/main.py b/findmyorder/main.py
index 6f193f4..500e772 100644
--- a/findmyorder/main.py
+++ b/findmyorder/main.py
@@ -1,10 +1,10 @@
 """
  FindMyOrder Main
 """
-import logging
 from datetime import datetime
 
 import emoji
+from loguru import logger
 from pyparsing import (
     Combine,
     Optional,
@@ -27,7 +27,8 @@ class FindMyOrder:
     def __init__(
         self,
     ):
-        self.logger = logging.getLogger(name="FMO")
+        self.logger = logger
+        # logging.getLogger(name="FMO")
 
     async def search(
         self,
diff --git a/pyproject.toml b/pyproject.toml
index 966d8ee..b87b581 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,6 +25,7 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.10"
 dynaconf = "^3.1.12"
+loguru = "^0.7.0"
 pyparsing = "^3.0.9"
 emoji = "^2.5.1"
 

From d2a2f12604ff8c140350ffb27e7d9e22260c173b Mon Sep 17 00:00:00 2001
From: mraniki <mraniki@users.noreply.github.com>
Date: Mon, 24 Jul 2023 10:11:59 +0000
Subject: [PATCH 2/2] Update Requirements

---
 .requirements/requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.requirements/requirements.txt b/.requirements/requirements.txt
index a1081d8..2b8a94a 100644
--- a/.requirements/requirements.txt
+++ b/.requirements/requirements.txt
@@ -1,3 +1,6 @@
+colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
 dynaconf==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
 emoji==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
+loguru==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
 pyparsing==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
+win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"