Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🥚 🔊 loguru implementation #251

Merged
merged 2 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -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"
75 changes: 25 additions & 50 deletions examples/example.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 3 additions & 2 deletions findmyorder/main.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""
FindMyOrder Main
"""
import logging
from datetime import datetime

import emoji
from loguru import logger
from pyparsing import (
Combine,
Optional,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down