emtl 0.1.5.dev1__tar.gz → 0.2.1.dev3__tar.gz

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.4
+current_version = 0.2.0
 commit = True
 tag = True
 
@@ -24,5 +24,5 @@ search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
 
 [bumpversion:file:.cookiecutterrc]
-search = version: {current_version}
-replace = version: {new_version}
+search = version: "{current_version}"
+replace = version: "{new_version}"

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/.cookiecutterrc

@@ -54,7 +54,7 @@ default_context:
     sphinx_theme: "alabaster"
     test_matrix_separate_coverage: "yes"
     tests_inside_package: "yes"
-    version: "0.1.3"
+    version: "0.2.0"
     version_manager: "bump2version"
     website: "riiy.gihub.io/emtl"
     year_from: "2024"

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/.github/workflows/github-actions.yml

@@ -32,48 +32,12 @@ jobs:
             python_arch: 'x64'
             tox_env: 'py310-cover'
             os: 'ubuntu-latest'
-          - name: 'py310-nocov (ubuntu)'
-            python: '3.10'
-            toxpython: 'python3.10'
-            python_arch: 'x64'
-            tox_env: 'py310-nocov'
-            os: 'ubuntu-latest'
-          - name: 'py310-cover (macos)'
-            python: '3.10'
-            toxpython: 'python3.10'
-            python_arch: 'x64'
-            tox_env: 'py310-cover'
-            os: 'macos-latest'
-          - name: 'py310-nocov (macos)'
-            python: '3.10'
-            toxpython: 'python3.10'
-            python_arch: 'x64'
-            tox_env: 'py310-nocov'
-            os: 'macos-latest'
           - name: 'py311-cover (ubuntu)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
             tox_env: 'py311-cover'
             os: 'ubuntu-latest'
-          - name: 'py311-nocov (ubuntu)'
-            python: '3.11'
-            toxpython: 'python3.11'
-            python_arch: 'x64'
-            tox_env: 'py311-nocov'
-            os: 'ubuntu-latest'
-          - name: 'py311-cover (macos)'
-            python: '3.11'
-            toxpython: 'python3.11'
-            python_arch: 'x64'
-            tox_env: 'py311-cover'
-            os: 'macos-latest'
-          - name: 'py311-nocov (macos)'
-            python: '3.11'
-            toxpython: 'python3.11'
-            python_arch: 'x64'
-            tox_env: 'py311-nocov'
-            os: 'macos-latest'
     steps:
     - uses: actions/checkout@v4
       with:

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/.pre-commit-config.yaml

@@ -6,7 +6,7 @@ exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.7
+    rev: v0.4.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes]

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/CHANGELOG.rst

@@ -22,3 +22,25 @@ Changelog
 ------------------
 
 * update docs theme
+
+0.1.5 (2024-04-24)
+------------------
+
+* update login refrence
+
+0.1.7 (2024-04-27)
+------------------
+
+* add insert order api
+
+
+0.1.8 (2024-04-30)
+------------------
+
+* delete macos actions
+
+
+0.2.0 (2024-05-21)
+------------------
+
+* complete all method

{emtl-0.1.5.dev1/src/emtl.egg-info → emtl-0.2.1.dev3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: emtl
-Version: 0.1.5.dev1
-Summary: 东方财富自动交易系统
+Version: 0.2.1.dev3
+Summary: 东方财富自动交易接口
 Home-page: https://github.com/riiy/emtl
-Author: Eastmoney Trade Library
+Author: Riiy
 Author-email: riiyzhou@gmail.com
 License: MIT
 Project-URL: Documentation, https://emtl.readthedocs.io/
@@ -11,7 +11,7 @@ Project-URL: Changelog, https://emtl.readthedocs.io/en/latest/changelog.html
 Project-URL: Issue Tracker, https://github.com/riiy/emtl/issues
 Keywords: autotrade,trade,东方财富,股票,交易,交易机器人
 Platform: UNKNOWN
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
@@ -33,7 +33,7 @@ Overview
 
 
 
-东方财富自动交易系统
+东方财富自动交易接口
 
 * Free software: MIT license
 
@@ -81,6 +81,13 @@ Note, to combine the coverage data from all the tox environments run:
             PYTEST_ADDOPTS=--cov-append tox
 
 
+Getting help
+============
+
+
+Join `Telegram group <https://t.me/em_trade_lib>`_. Asking a question here is often the quickest way to get a pointer in the right direction.
+
+
 Changelog
 =========
 
@@ -105,4 +112,26 @@ Changelog
 
 * update docs theme
 
+0.1.5 (2024-04-24)
+------------------
+
+* update login refrence
+
+0.1.7 (2024-04-27)
+------------------
+
+* add insert order api
+
+
+0.1.8 (2024-04-30)
+------------------
+
+* delete macos actions
+
+
+0.2.0 (2024-05-21)
+------------------
+
+* complete all method
+
 

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/README.rst

@@ -41,15 +41,15 @@ Overview
     :alt: Supported implementations
     :target: https://pypi.org/project/emtl
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/riiy/emtl/v0.1.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/riiy/emtl/v0.2.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/riiy/emtl/compare/v0.1.4...master
+    :target: https://github.com/riiy/emtl/compare/v0.2.0...master
 
 
 
 .. end-badges
 
-东方财富自动交易系统
+东方财富自动交易接口
 
 * Free software: MIT license
 
@@ -95,3 +95,10 @@ Note, to combine the coverage data from all the tox environments run:
       - ::
 
             PYTEST_ADDOPTS=--cov-append tox
+
+
+Getting help
+============
+
+
+Join `Telegram group <https://t.me/em_trade_lib>`_. Asking a question here is often the quickest way to get a pointer in the right direction.

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/docs/conf.py

@@ -25,7 +25,7 @@ except Exception:
     import traceback
 
     traceback.print_exc()
-    version = release = "0.1.4"
+    version = release = "0.2.0"
 
 pygments_style = "trac"
 templates_path = ["."]

emtl-0.2.1.dev3/docs/usage.rst

@@ -0,0 +1,12 @@
+=====
+Usage
+=====
+
+To use the project:
+
+.. code-block:: python
+
+    import emtl
+    emtl.login("2020123456789", "123456")
+    asset = emtl.query_asset_and_position()
+    print(asset)

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/setup.py

@@ -16,15 +16,15 @@ setup(
     use_scm_version={
         "local_scheme": "dirty-tag",
         "write_to": "src/emtl/_version.py",
-        "fallback_version": "0.1.4",
+        "fallback_version": "0.2.0",
     },
     license="MIT",
-    description="东方财富自动交易系统",
+    description="东方财富自动交易接口",
     long_description="{}\n{}".format(
         re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub("", read("README.rst")),
         re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
-    author="Eastmoney Trade Library",
+    author="Riiy",
     author_email="riiyzhou@gmail.com",
     url="https://github.com/riiy/emtl",
     packages=find_packages("src"),
@@ -34,7 +34,7 @@ setup(
     zip_safe=False,
     classifiers=[
         # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
-        "Development Status :: 2 - Pre-Alpha",
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: Unix",

emtl-0.2.1.dev3/src/emtl/__init__.py

@@ -0,0 +1,23 @@
+__version__ = "0.2.0"
+
+from .core import cancel_order
+from .core import insert_order
+from .core import login
+from .core import query_asset_and_position
+from .core import query_funds_flow
+from .core import query_history_orders
+from .core import query_history_trades
+from .core import query_orders
+from .core import query_trades
+
+__all__ = [
+    "login",
+    "query_asset_and_position",
+    "query_orders",
+    "query_history_orders",
+    "query_trades",
+    "query_history_trades",
+    "query_funds_flow",
+    "insert_order",
+    "cancel_order",
+]

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/src/emtl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.5.dev1'
-__version_tuple__ = version_tuple = (0, 1, 5, 'dev1')
+__version__ = version = '0.2.1.dev3'
+__version_tuple__ = version_tuple = (0, 2, 1, 'dev3')

emtl-0.2.1.dev3/src/emtl/cli.py

@@ -0,0 +1,27 @@
+import argparse
+
+from .utils import get_logger
+
+logger = get_logger(__name__)
+
+
+logger.info("cli")
+parser = argparse.ArgumentParser(prog="emt", description="东方财富交易接口", epilog="东方财富交易接口")
+parser.add_argument("-u", "--user", required=False)
+parser.add_argument("-p", "--password", required=False)
+group = parser.add_mutually_exclusive_group()
+group.add_argument("-b", "--buy", help="买入股票，格式为：代码－价格－数量。例子买入一手平安银行：000001-10.21-100")
+group.add_argument("-s", "--sell", help="卖出股票，格式为：代码－价格－数量。卖一手平安银行：000001-10.21-100")
+group.add_argument("-q", "--query", type=str, choices=["asset", "order", "trade"], help="查询账户的资产、挂单、成交")
+
+
+def run(args=None):
+    logger.info(args)
+    args = parser.parse_args(args=args)
+    logger.info(args)
+    print(args.user, args.password)
+    parser.exit(0)
+
+
+if __name__ == "__main__":
+    run()

emtl-0.2.1.dev3/src/emtl/core.py

@@ -0,0 +1,233 @@
+import os
+import re
+from random import SystemRandom
+from typing import Any
+from typing import Optional
+
+from ddddocr import DdddOcr
+from requests import Response
+from requests import Session
+from requests import get
+
+from .const import _base_headers
+from .const import _urls
+from .utils import emt_trade_encrypt
+from .utils import get_float
+from .utils import get_logger
+
+logger = get_logger(__name__)
+ocr = DdddOcr(show_ad=False)
+session = Session()
+_em_validate_key = ""
+
+
+def _query_snapshot(symbol_code: str, market: str) -> Optional[dict]:
+    url = "https://emhsmarketwg.eastmoneysec.com/api/SHSZQuoteSnapshot"
+    params = {"id": symbol_code.strip(), "market": market}
+    headers = _base_headers.copy()
+    resp = session.get(url, params=params, headers=headers)
+    _check_resp(resp)
+    return resp.json()
+
+
+def get_last_price(symbol_code: str, market: str) -> float:
+    ret = _query_snapshot(symbol_code, market)
+    if ret is None or "status" not in ret or ret["status"] != 0:
+        return float("nan")
+
+    return get_float(ret["realtimequote"], "currentPrice")
+
+
+def _check_resp(resp: Response):
+    if resp.status_code != 200:
+        logger.error(f"request {resp.url} fail, code={resp.status_code}, response={resp.text}")
+        raise
+
+
+def _query_something(tag: str, req_data: Optional[dict] = None) -> Optional[Response]:
+    """通用查询函数
+
+    :param tag: 请求类型
+    :param req_data: 请求提交数据,可选
+    :return:
+    """
+    if not _em_validate_key:
+        validate_key = login()
+    else:
+        validate_key = _em_validate_key
+    logger.info(validate_key)
+    assert tag in _urls, f"{tag} not in url list"
+    url = _urls[tag] + validate_key
+    if req_data is None:
+        req_data = {
+            "qqhs": 100,
+            "dwc": "",
+        }
+    headers = _base_headers.copy()
+    headers["X-Requested-With"] = "XMLHttpRequest"
+    logger.debug(f"(tag={tag}), (data={req_data}), (url={url})")
+    resp = session.post(url, headers=headers, data=req_data)
+    _check_resp(resp)
+    return resp
+
+
+def _get_captcha_code() -> tuple[float, Any]:
+    """get random number and captcha code."""
+    cryptogen = SystemRandom()
+    random_num = cryptogen.random()
+    resp = get(f"{_urls['yzm']}{random_num}", headers=_base_headers, timeout=60)
+    _check_resp(resp)
+    code = ocr.classification(resp.content)
+    if code:
+        try:
+            code = int(code)
+        except Exception as e:
+            logger.error(f"get_captcha_code found exception: {e}, ocr result={code}")
+            return _get_captcha_code()
+
+    return random_num, code
+
+
+def _get_em_validate_key():
+    """获取 em_validatekey"""
+    url = "https://jywg.18.cn/Trade/Buy"
+    resp = session.get(url, headers=_base_headers)
+    _check_resp(resp)
+    match_result = re.findall(r'id="em_validatekey" type="hidden" value="(.*?)"', resp.text)
+    if match_result:
+        _em_validatekey = match_result[0].strip()
+        global _em_validate_key
+        _em_validate_key = _em_validatekey
+        return _em_validatekey
+
+
+def login(username: str = "", password: str = "", duration: int = 30) -> Optional[str]:
+    """登录接口.
+
+    :param str username: 用户名
+    :param str password: 密码(明文)
+    :param duration: 在线时长(分钟), defaults to 30
+    :type duration: int, optional
+    :return:
+    """
+    if not username:
+        username = os.getenv("EM_USERNAME", "")
+    if not password:
+        password = os.getenv("EM_PASSWORD", "")
+    random_num, code = _get_captcha_code()
+    headers = _base_headers.copy()
+    headers["X-Requested-With"] = "XMLHttpRequest"
+    headers["Referer"] = "https://jywg.18.cn/Login?el=1&clear=&returl=%2fTrade%2fBuy"
+    headers["Content-Type"] = "application/x-www-form-urlencoded"
+    url = _urls["login"]
+    data = {
+        "userId": username.strip(),
+        "password": emt_trade_encrypt(password.strip()),
+        "randNumber": random_num,
+        "identifyCode": code,
+        "duration": duration,
+        "authCode": "",
+        "type": "Z",
+        "secInfo": "",
+    }
+    resp = session.post(url, headers=headers, data=data)
+    _check_resp(resp)
+    try:
+        logger.info(f"login success for {resp.json()}")
+        return _get_em_validate_key()
+    except KeyError as e:
+        logger.error(f"param data found exception:[{e}], [data={resp}]")
+
+
+def query_asset_and_position():
+    """Get asset and position."""
+    resp = _query_something("query_asset_and_pos")
+    if resp:
+        return resp.json()
+
+
+def query_orders():
+    """查询订单."""
+    resp = _query_something("query_orders")
+    if resp:
+        return resp.json()
+
+
+def query_trades():
+    """查询成交."""
+    resp = _query_something("query_trades")
+    if resp:
+        return resp.json()
+
+
+def query_history_orders(size, start_time, end_time):
+    """查询历史订单.
+
+    :param int size: 请求的数据的条目数
+    :param str start_time: 起始时间, 格式"%Y-%m-%d"
+    :param str end_time: 起始时间, 格式"%Y-%m-%d"
+    :return dict:
+    """
+    resp = _query_something("query_his_orders", {"qqhs": size, "dwc": "", "st": start_time, "et": end_time})
+    if resp:
+        return resp.json()
+
+
+def query_history_trades(size, start_time, end_time):
+    """查询历史成交.
+
+    :param int size: 请求的数据的条目数
+    :param str start_time: 起始时间, 格式"%Y-%m-%d"
+    :param str end_time: 起始时间, 格式"%Y-%m-%d"
+    :return dict:
+    """
+    resp = _query_something("query_his_trades", {"qqhs": size, "dwc": "", "st": start_time, "et": end_time})
+    if resp:
+        return resp.json()
+
+
+def query_funds_flow(size, start_time, end_time):
+    """查询资金.
+
+    :param int size: 请求的数据的条目数
+    :param str start_time: 起始时间, 格式"%Y-%m-%d"
+    :param str end_time: 起始时间, 格式"%Y-%m-%d"
+    :return dict:
+    """
+    resp = _query_something("query_funds_flow", {"qqhs": size, "dwc": "", "st": start_time, "et": end_time})
+    if resp:
+        return resp.json()
+
+
+def insert_order(stock_code, trade_type, market: str, price: float, amount: int):
+    """交易接口, 买入或卖出.
+
+    :param str stock_code: 股票代码
+    :param str trade_type: 交易方向,B for buy, S for sell
+    :param str market: 股票市场,HA 上海, SA
+    :param float price: 股票价格
+    :param int amount: 买入/卖出数量
+    """
+    req_data = {
+        "stockCode": stock_code,
+        "tradeType": trade_type,
+        "zqmc": "",
+        "market": market,
+        "price": price,
+        "amount": amount,
+    }
+    resp = _query_something("insert_order", req_data=req_data)
+    logger.info(resp)
+    if resp:
+        return resp.json()
+
+
+def cancel_order(order_str: str):
+    """取消交易接口.
+
+    :param str order_str: 订单字符串, 由成交日期+成交编号组成. 在insert_order和query_order接口, Wtrq的值是成交日期, Wtbh的值是成交编号, 格式为: 20240520_130662
+    """
+    data = {"revokes": order_str.strip()}
+    resp = _query_something("cancel_order", req_data=data)
+    if resp:
+        return resp.text.strip()

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/src/emtl/tests/test_cli.py

@@ -2,4 +2,4 @@ import subprocess
 
 
 def test_cli():
-    assert subprocess.check_output(["emt", "-u=foo", "-p=bar"], text=True) == "('foo', 'bar')\n"
+    assert subprocess.check_output(["emt", "-u=foo", "-p=bar"], text=True) == "foo bar\n"

emtl-0.2.1.dev3/src/emtl/tests/test_core.py

@@ -0,0 +1,88 @@
+import datetime
+import math
+import os
+
+from emtl.core import cancel_order
+from emtl.core import get_last_price
+from emtl.core import insert_order
+from emtl.core import query_funds_flow
+from emtl.core import query_history_orders
+from emtl.core import query_history_trades
+from emtl.core import query_orders
+from emtl.core import query_trades
+
+from .. import login
+from .. import query_asset_and_position
+
+
+def test_login():
+    validate_key = login(os.getenv("EM_USERNAME", ""), os.getenv("EM_PASSWORD", ""))
+    assert validate_key
+    assert len(validate_key) == len("b91d8012-b70b-4265-bb5d-f79442531017")
+
+
+def test_query_asset_position():
+    resp = query_asset_and_position()
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_query_orders():
+    resp = query_orders()
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_query_trades():
+    resp = query_trades()
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_query_history_orders():
+    end_date = datetime.datetime.now(datetime.timezone.utc)
+    start_date = end_date - datetime.timedelta(30)
+    st = start_date.strftime("%Y-%m-%d")
+    et = end_date.strftime("%Y-%m-%d")
+
+    resp = query_history_orders(100, st, et)
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_query_history_trades():
+    end_date = datetime.datetime.now(datetime.timezone.utc)
+    start_date = end_date - datetime.timedelta(30)
+    st = start_date.strftime("%Y-%m-%d")
+    et = end_date.strftime("%Y-%m-%d")
+
+    resp = query_history_trades(100, st, et)
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_query_funds_flow():
+    end_date = datetime.datetime.now(datetime.timezone.utc)
+    start_date = end_date - datetime.timedelta(30)
+    st = start_date.strftime("%Y-%m-%d")
+    et = end_date.strftime("%Y-%m-%d")
+
+    resp = query_funds_flow(100, st, et)
+    assert resp
+    assert resp["Status"] == 0
+
+
+def test_insert_order():
+    resp = insert_order("000002", "B", "SA", 5.01, 100)
+    assert resp
+    assert resp["Status"] in (0, -1)
+
+
+def test_cancel_order():
+    resp = cancel_order("20240520_130662")
+    assert resp
+    assert resp.startswith("130662")
+
+
+def test_last_price():
+    assert math.isnan(get_last_price("000001", "SA"))

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/src/emtl/utils.py

@@ -1,8 +1,6 @@
 import base64
 import logging
-from dataclasses import dataclass
-from typing import Any
-from typing import Optional
+import math
 
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import padding
@@ -18,17 +16,6 @@ c0AT4qIJ/xtbBcHkFPK77upnsfDTJiVEuQDH+MiMeb+XhCLNKZGp0yaUU6GlxZdp
 """
 
 
-@dataclass
-class Response:
-    message: str
-    status: int
-    error_code: str
-    data: Any
-
-    def is_ok(self) -> bool:
-        return not self.message and self.status == 0
-
-
 def get_logger(name):
     """Logger."""
     formater = "%(asctime)s %(name)-20s %(funcName)s %(lineno)d: %(levelname)-8s: %(message)s"
@@ -37,15 +24,23 @@ def get_logger(name):
     return logger
 
 
-def response_deserialize(data: dict) -> Optional[Response]:
-    if data is None:
-        return None
-    return Response(
-        data["Message"] if "Message" in data else "", data["Status"], data["Errcode"] if "Errcode" in data else "", data["Data"]
-    )
-
-
 def emt_trade_encrypt(content: str) -> str:
     _pub_key: rsa.RSAPublicKey = serialization.load_pem_public_key(rsa_public_key.encode("utf-8"))  # type:ignore
     encrypt_text = _pub_key.encrypt(content.encode(), padding.PKCS1v15())
     return base64.b64encode(encrypt_text).decode("utf-8")
+
+
+def double_equal(a, b) -> bool:
+    return math.fabs(a - b) < 1e-6
+
+
+def get_float(data: dict, key: str) -> float:
+    if v := data[key].strip():
+        return float(v)
+    return 0.0
+
+
+def get_int(data: dict, key: str) -> int:
+    if v := data[key].strip():
+        return int(v)
+    return 0

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3/src/emtl.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: emtl
-Version: 0.1.5.dev1
-Summary: 东方财富自动交易系统
+Version: 0.2.1.dev3
+Summary: 东方财富自动交易接口
 Home-page: https://github.com/riiy/emtl
-Author: Eastmoney Trade Library
+Author: Riiy
 Author-email: riiyzhou@gmail.com
 License: MIT
 Project-URL: Documentation, https://emtl.readthedocs.io/
@@ -11,7 +11,7 @@ Project-URL: Changelog, https://emtl.readthedocs.io/en/latest/changelog.html
 Project-URL: Issue Tracker, https://github.com/riiy/emtl/issues
 Keywords: autotrade,trade,东方财富,股票,交易,交易机器人
 Platform: UNKNOWN
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
@@ -33,7 +33,7 @@ Overview
 
 
 
-东方财富自动交易系统
+东方财富自动交易接口
 
 * Free software: MIT license
 
@@ -81,6 +81,13 @@ Note, to combine the coverage data from all the tox environments run:
             PYTEST_ADDOPTS=--cov-append tox
 
 
+Getting help
+============
+
+
+Join `Telegram group <https://t.me/em_trade_lib>`_. Asking a question here is often the quickest way to get a pointer in the right direction.
+
+
 Changelog
 =========
 
@@ -105,4 +112,26 @@ Changelog
 
 * update docs theme
 
+0.1.5 (2024-04-24)
+------------------
+
+* update login refrence
+
+0.1.7 (2024-04-27)
+------------------
+
+* add insert order api
+
+
+0.1.8 (2024-04-30)
+------------------
+
+* delete macos actions
+
+
+0.2.0 (2024-05-21)
+------------------
+
+* complete all method
+
 

{emtl-0.1.5.dev1 → emtl-0.2.1.dev3}/tox.ini

@@ -14,7 +14,7 @@ envlist =
     clean,
     check,
     docs,
-    {py310,py311}-{cover,nocov},
+    {py310,py311}-{cover},
     report
 ignore_basepython_conflict = true
 
@@ -30,12 +30,10 @@ passenv =
     *
 usedevelop =
     cover: true
-    nocov: false
 deps =
     pytest
     cover: pytest-cov
 commands =
-    nocov: {posargs:pytest -vv --ignore=src}
     cover: {posargs:pytest --cov --cov-report=term-missing --cov-report=xml -vv}
 
 [testenv:check]

emtl-0.1.5.dev1/docs/usage.rst

@@ -1,12 +0,0 @@
-=====
-Usage
-=====
-
-To use the project:
-
-.. code-block:: python
-
-    import emtl
-    emtl.emt(...)
-    emtl.login(...)
-    emtl.query_asset_and_position(...)

emtl-0.1.5.dev1/src/emtl/__init__.py

@@ -1,11 +0,0 @@
-__version__ = "0.1.4"
-
-from .core import emt
-from .core import login
-from .core import query_asset_and_position
-
-__all__ = [
-    "emt",
-    "login",
-    "query_asset_and_position",
-]

emtl-0.1.5.dev1/src/emtl/cli.py

@@ -1,30 +0,0 @@
-"""
-Module that contains the command line app.
-
-Why does this file exist, and why not put this in __main__?
-
-  You might be tempted to import things from __main__ later, but that will cause
-  problems: the code will get executed twice:
-
-  - When you run `python -memtl` python will execute
-    ``__main__.py`` as a script. That means there will not be any
-    ``emtl.__main__`` in ``sys.modules``.
-  - When you import __main__ it will get executed again (as a module) because
-    there"s no ``emtl.__main__`` in ``sys.modules``.
-
-  Also see (1) from http://click.pocoo.org/5/setuptools/#setuptools-integration
-"""
-
-import argparse
-
-from .core import emt
-
-parser = argparse.ArgumentParser(prog="emt", description="东方财富交易系统", epilog="东方财富交易系统")
-parser.add_argument("-u", "--user", required=True)
-parser.add_argument("-p", "--password", required=True)
-
-
-def run(args=None):
-    args = parser.parse_args(args=args)
-    print(emt(args.user, args.password))
-    parser.exit(0)

emtl-0.1.5.dev1/src/emtl/core.py

@@ -1,141 +0,0 @@
-import re
-from random import SystemRandom
-from typing import Any
-from typing import Optional
-
-from ddddocr import DdddOcr
-from requests import Response
-from requests import Session
-from requests import get
-
-from .const import _base_headers
-from .const import _urls
-from .utils import Response as Resp
-from .utils import emt_trade_encrypt
-from .utils import get_logger
-from .utils import response_deserialize
-
-logger = get_logger(__name__)
-ocr = DdddOcr(show_ad=False)
-session = Session()
-_em_validate_key = ""
-
-
-def emt(user, password):
-    return user, password
-
-
-def _check_resp(resp: Response):
-    if resp.status_code != 200:
-        logger.error(f"request {resp.url} fail, code={resp.status_code}, response={resp.text}")
-        return False
-    return True
-
-
-def _query_something(tag: str, count: int = 100, data: Optional[dict] = None) -> Optional[Response]:
-    """通用查询函数
-
-    :param tag: 请求类型
-    :param count: 查询数量,可选
-    :param data: 请求提交数据,可选
-    :return:
-    """
-    assert _em_validate_key, "em_validatekey is empty"
-    assert tag in _urls, f"{tag} not in url list"
-    url = _urls[tag] + _em_validate_key
-    if data is None:
-        if count <= 0:
-            count = 100
-        elif count > 1000:
-            count = 1000
-        data = {
-            "qqhs": count,
-            "dwc": "",
-        }
-    headers = _base_headers.copy()
-    headers["X-Requested-With"] = "XMLHttpRequest"
-    logger.debug(f"(tag={tag}), (data={data}), (url={url})")
-    resp = session.post(url, headers=headers, data=data)
-    if not _check_resp(resp):
-        return None
-    logger.debug(resp.text)
-    return resp
-
-
-def _get_captcha_code() -> Optional[tuple[float, Any]]:
-    """get random number and captcha code."""
-    cryptogen = SystemRandom()
-    random_num = cryptogen.random()
-    resp = get(f"{_urls['yzm']}{random_num}", headers=_base_headers, timeout=60)
-    if not _check_resp(resp):
-        return None
-    code = ocr.classification(resp.content)
-    logger.debug(f"random_num={random_num}, code={code}")
-    if code:
-        try:
-            return random_num, int(code)
-        except Exception as e:
-            logger.error(f"get_captcha_code found exception: {e}, ocr result={code}")
-            return _get_captcha_code()
-
-
-def _get_em_validate_key():
-    """获取 em_validatekey"""
-    url = "https://jywg.18.cn/Trade/Buy"
-    resp = session.get(url, headers=_base_headers)
-    if not _check_resp(resp):
-        return None
-    match_result = re.findall(r'id="em_validatekey" type="hidden" value="(.*?)"', resp.text)
-    if match_result:
-        _em_validatekey = match_result[0].strip()
-        global _em_validate_key
-        _em_validate_key = _em_validatekey
-        return _em_validatekey
-
-
-def login(username: str, password: str, duration: int = 30) -> Optional[str]:
-    """登录接口.
-
-    :param str username: 用户名
-    :param str password: 密码(明文)
-    :param duration: 在线时长(分钟), defaults to 30
-    :type duration: int, optional
-    :return:
-    """
-    if (ret := _get_captcha_code()) is None:
-        return ""
-    random_num, code = ret
-    logger.error(code)
-    headers = _base_headers.copy()
-    headers["X-Requested-With"] = "XMLHttpRequest"
-    headers["Referer"] = "https://jywg.18.cn/Login?el=1&clear=&returl=%2fTrade%2fBuy"
-    headers["Content-Type"] = "application/x-www-form-urlencoded"
-    url = _urls["login"]
-    data = {
-        "userId": username.strip(),
-        "password": emt_trade_encrypt(password.strip()),
-        "randNumber": random_num,
-        "identifyCode": code,
-        "duration": duration,
-        "authCode": "",
-        "type": "Z",
-        "secInfo": "",
-    }
-    resp = session.post(url, headers=headers, data=data)
-    if not _check_resp(resp):
-        return None
-    data = resp.json()
-    try:
-        resp = response_deserialize(data)
-        if resp and resp.status == 0 and resp.message.strip() == "":
-            logger.info(f"login success for {resp.data[0]['khmc']}({username})")
-            return _get_em_validate_key()
-    except KeyError as e:
-        logger.error(f"param data found exception:[{e}], [data={data}]")
-
-
-def query_asset_and_position() -> Optional[Resp]:
-    """Get asset and position."""
-    resp = _query_something("query_asset_and_pos")
-    if resp:
-        return response_deserialize(resp.json())

emtl-0.1.5.dev1/src/emtl/tests/test_core.py

@@ -1,27 +0,0 @@
-import os
-from typing import Optional
-
-from .. import emt
-from .. import login
-from .. import query_asset_and_position
-from ..utils import Response
-
-
-def test_emt():
-    assert emt("user", "pass") == ("user", "pass")
-
-
-def test_emt_empty():
-    assert emt("", "") == ("", "")
-
-
-def test_login():
-    validate_key = login(os.getenv("EM_USERNAME", ""), os.getenv("EM_PASSWORD", ""))
-    if validate_key:
-        assert len(validate_key) == len("b91d8012-b70b-4265-bb5d-f79442531017")
-
-
-def test_query_asset_position():
-    resp: Optional[Response] = query_asset_and_position()
-    if resp:
-        assert resp.error_code == 0