forked from kodorvan/stcs
Compare commits
24 Commits
3ff146a1b9
...
0.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 58a4c6af06 | |||
| b37b7193b2 | |||
| 05e8005ec9 | |||
|
0de3b17d1d | ||
|
|
b77c0f7dcc | ||
|
|
3ccfb64be8 | ||
| 13d69e2f73 | |||
|
|
751cde86f9 | ||
|
|
1b95992297 | ||
|
|
d8bb3fda82 | ||
|
|
4704d4a486 | ||
|
|
c7b3ae7876 | ||
|
|
6fb876ade2 | ||
| 82d875136b | |||
| 28ead61112 | |||
| 688fc7a8ab | |||
| 07666fa984 | |||
|
|
b3119c6ee1 | ||
|
|
da16a267e4 | ||
|
|
babbcbd1fc | ||
|
|
f42940f847 | ||
| 15e248d7d7 | |||
| cdb745d55a | |||
| c46a4cb0b7 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -11,3 +11,7 @@ venv/
|
||||
/.idea
|
||||
/myenv
|
||||
myenv
|
||||
|
||||
*.sqlite3
|
||||
|
||||
*.log
|
||||
|
||||
5
.idea/.gitignore
generated
vendored
5
.idea/.gitignore
generated
vendored
@@ -1,5 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
610
.idea/dbnavigator.xml
generated
610
.idea/dbnavigator.xml
generated
@@ -1,610 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DBNavigator.Project.DDLFileAttachmentManager">
|
||||
<mappings />
|
||||
<preferences />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DataEditorManager">
|
||||
<record-view-column-sorting-type value="BY_INDEX" />
|
||||
<value-preview-text-wrapping value="false" />
|
||||
<value-preview-pinned value="false" />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseAssistantManager">
|
||||
<assistants>
|
||||
<assistant-state connection-id="539567a8-9e28-4dbe-b015-5c44ee3cfda5" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="0f4bac5e-2797-4db3-bad2-53cbf8cd2b20" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="be96bc1e-ca0e-4a7f-a163-9127fdee15c6" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="8d8de23e-fc36-46b8-a593-c47740aca91b" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="d0ab0625-5cb0-46d3-9aa4-4d4b02bd8890" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="4a35d891-e512-4ca8-85c4-6f6647deefbc" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="431aa026-563e-40e3-a8f7-50e01f1f1af7" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
<assistant-state connection-id="f5fd2325-996b-4e52-a9f8-b1dcee5d149d" default-profile-name="" selected-conversation-id="" assistant-type="GENERIC" availability="UNAVAILABLE" acknowledgement="NONE">
|
||||
<conversations />
|
||||
</assistant-state>
|
||||
</assistants>
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseBrowserManager">
|
||||
<autoscroll-to-editor value="false" />
|
||||
<autoscroll-from-editor value="true" />
|
||||
<show-object-properties value="false" />
|
||||
<loaded-nodes />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseConsoleManager">
|
||||
<connection id="0f4bac5e-2797-4db3-bad2-53cbf8cd2b20">
|
||||
<console name="Connection" type="STANDARD" schema="main" session="Main" />
|
||||
</connection>
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseEditorStateManager">
|
||||
<last-used-providers />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseFileManager">
|
||||
<open-files />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatabaseSessionManager">
|
||||
<connection id="0f4bac5e-2797-4db3-bad2-53cbf8cd2b20" />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DatasetFilterManager">
|
||||
<filter-actions connection-id="0f4bac5e-2797-4db3-bad2-53cbf8cd2b20" dataset="main.user_bybit_api" active-filter-id="EMPTY_FILTER" />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.ExecutionManager">
|
||||
<retain-sticky-names value="false" />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.MethodExecutionManager">
|
||||
<method-browser />
|
||||
<execution-history>
|
||||
<group-entries value="true" />
|
||||
<execution-inputs />
|
||||
</execution-history>
|
||||
<execution-variables-cache />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.ObjectQuickFilterManager">
|
||||
<last-used-operator value="EQUAL" />
|
||||
<filters />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.Settings">
|
||||
<connections>
|
||||
<connection source-id="" id="0f4bac5e-2797-4db3-bad2-53cbf8cd2b20" active="true" signed="true">
|
||||
<database>
|
||||
<name value="Connection" />
|
||||
<description value="" />
|
||||
<database-type value="SQLITE" />
|
||||
<config-type value="BASIC" />
|
||||
<database-version value="3.5" />
|
||||
<driver-source value="BUNDLED" />
|
||||
<driver-library value="" />
|
||||
<driver value="" />
|
||||
<url-type value="FILE" />
|
||||
<host value="" />
|
||||
<port value="" />
|
||||
<database value="" />
|
||||
<tns-folder value="" />
|
||||
<tns-profile value="" />
|
||||
<server-type value="" />
|
||||
<protocol value="" />
|
||||
<url-parameters />
|
||||
<files>
|
||||
<file path="C:\Users\Algiz_N\PycharmProjects\stcs\db.sqlite3" schema="main" />
|
||||
</files>
|
||||
<type value="NONE" />
|
||||
<user value="" />
|
||||
<token-type value="" />
|
||||
<token-config-file value="" />
|
||||
<token-profile value="" />
|
||||
<session-user value="" />
|
||||
</database>
|
||||
<properties>
|
||||
<auto-commit value="true" />
|
||||
</properties>
|
||||
<ssh-settings>
|
||||
<active value="false" />
|
||||
<proxy-host value="" />
|
||||
<proxy-port value="22" />
|
||||
<proxy-user value="" />
|
||||
<auth-type value="PASSWORD" />
|
||||
<key-file value="" />
|
||||
</ssh-settings>
|
||||
<ssl-settings>
|
||||
<active value="false" />
|
||||
<certificate-authority-file value="" />
|
||||
<client-certificate-file value="" />
|
||||
<client-key-file value="" />
|
||||
</ssl-settings>
|
||||
<details>
|
||||
<charset value="UTF-8" />
|
||||
<session-management value="true" />
|
||||
<ddl-file-binding value="true" />
|
||||
<database-logging value="true" />
|
||||
<connect-automatically value="true" />
|
||||
<restore-workspace value="true" />
|
||||
<restore-workspace-deep value="false" />
|
||||
<environment-type value="default" />
|
||||
<connectivity-timeout value="30" />
|
||||
<idle-time-to-disconnect value="30" />
|
||||
<idle-time-to-disconnect-pool value="5" />
|
||||
<credential-expiry-time value="10" />
|
||||
<max-connection-pool-size value="7" />
|
||||
<alternative-statement-delimiter value="" />
|
||||
</details>
|
||||
<debugger>
|
||||
<compile-dependencies value="true" />
|
||||
<tcp-driver-tunneling value="false" />
|
||||
<tcp-host-address value="" />
|
||||
<tcp-port-from value="4000" />
|
||||
<tcp-port-to value="4999" />
|
||||
<debugger-type value="JDBC" />
|
||||
</debugger>
|
||||
<object-filters hide-empty-schemas="false" hide-pseudo-columns="false" hide-audit-columns="false">
|
||||
<object-filters />
|
||||
<object-type-filter use-master-settings="true">
|
||||
<object-type name="SCHEMA" enabled="true" />
|
||||
<object-type name="USER" enabled="true" />
|
||||
<object-type name="ROLE" enabled="true" />
|
||||
<object-type name="PRIVILEGE" enabled="true" />
|
||||
<object-type name="CHARSET" enabled="true" />
|
||||
<object-type name="TABLE" enabled="true" />
|
||||
<object-type name="VIEW" enabled="true" />
|
||||
<object-type name="JSON_VIEW" enabled="true" />
|
||||
<object-type name="MATERIALIZED_VIEW" enabled="true" />
|
||||
<object-type name="NESTED_TABLE" enabled="true" />
|
||||
<object-type name="COLUMN" enabled="true" />
|
||||
<object-type name="INDEX" enabled="true" />
|
||||
<object-type name="CONSTRAINT" enabled="true" />
|
||||
<object-type name="DATASET_TRIGGER" enabled="true" />
|
||||
<object-type name="DATABASE_TRIGGER" enabled="true" />
|
||||
<object-type name="SYNONYM" enabled="true" />
|
||||
<object-type name="SEQUENCE" enabled="true" />
|
||||
<object-type name="PROCEDURE" enabled="true" />
|
||||
<object-type name="FUNCTION" enabled="true" />
|
||||
<object-type name="PACKAGE" enabled="true" />
|
||||
<object-type name="TYPE" enabled="true" />
|
||||
<object-type name="TYPE_ATTRIBUTE" enabled="true" />
|
||||
<object-type name="ARGUMENT" enabled="true" />
|
||||
<object-type name="JAVA_CLASS" enabled="true" />
|
||||
<object-type name="JAVA_FIELD" enabled="true" />
|
||||
<object-type name="JAVA_METHOD" enabled="true" />
|
||||
<object-type name="JAVA_RESOURCE" enabled="true" />
|
||||
<object-type name="DIMENSION" enabled="true" />
|
||||
<object-type name="CLUSTER" enabled="true" />
|
||||
<object-type name="DBLINK" enabled="true" />
|
||||
<object-type name="CREDENTIAL" enabled="true" />
|
||||
<object-type name="AI_PROFILE" enabled="true" />
|
||||
</object-type-filter>
|
||||
</object-filters>
|
||||
</connection>
|
||||
</connections>
|
||||
<browser-settings>
|
||||
<general>
|
||||
<display-mode value="TABBED" />
|
||||
<navigation-history-size value="100" />
|
||||
<show-object-details value="false" />
|
||||
<enable-sticky-paths value="true" />
|
||||
<enable-quick-filters value="false" />
|
||||
</general>
|
||||
<filters>
|
||||
<object-type-filter>
|
||||
<object-type name="SCHEMA" enabled="true" />
|
||||
<object-type name="USER" enabled="true" />
|
||||
<object-type name="ROLE" enabled="true" />
|
||||
<object-type name="PRIVILEGE" enabled="true" />
|
||||
<object-type name="CHARSET" enabled="true" />
|
||||
<object-type name="TABLE" enabled="true" />
|
||||
<object-type name="VIEW" enabled="true" />
|
||||
<object-type name="JSON_VIEW" enabled="true" />
|
||||
<object-type name="MATERIALIZED_VIEW" enabled="true" />
|
||||
<object-type name="NESTED_TABLE" enabled="true" />
|
||||
<object-type name="COLUMN" enabled="true" />
|
||||
<object-type name="INDEX" enabled="true" />
|
||||
<object-type name="CONSTRAINT" enabled="true" />
|
||||
<object-type name="DATASET_TRIGGER" enabled="true" />
|
||||
<object-type name="DATABASE_TRIGGER" enabled="true" />
|
||||
<object-type name="SYNONYM" enabled="true" />
|
||||
<object-type name="SEQUENCE" enabled="true" />
|
||||
<object-type name="PROCEDURE" enabled="true" />
|
||||
<object-type name="FUNCTION" enabled="true" />
|
||||
<object-type name="PACKAGE" enabled="true" />
|
||||
<object-type name="TYPE" enabled="true" />
|
||||
<object-type name="TYPE_ATTRIBUTE" enabled="true" />
|
||||
<object-type name="ARGUMENT" enabled="true" />
|
||||
<object-type name="JAVA_CLASS" enabled="true" />
|
||||
<object-type name="JAVA_FIELD" enabled="true" />
|
||||
<object-type name="JAVA_METHOD" enabled="true" />
|
||||
<object-type name="JAVA_RESOURCE" enabled="true" />
|
||||
<object-type name="DIMENSION" enabled="true" />
|
||||
<object-type name="CLUSTER" enabled="true" />
|
||||
<object-type name="DBLINK" enabled="true" />
|
||||
<object-type name="CREDENTIAL" enabled="true" />
|
||||
<object-type name="AI_PROFILE" enabled="true" />
|
||||
</object-type-filter>
|
||||
</filters>
|
||||
<sorting>
|
||||
<object-type name="COLUMN" sorting-type="NAME" />
|
||||
<object-type name="FUNCTION" sorting-type="NAME" />
|
||||
<object-type name="PROCEDURE" sorting-type="NAME" />
|
||||
<object-type name="ARGUMENT" sorting-type="POSITION" />
|
||||
<object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
|
||||
</sorting>
|
||||
<default-editors>
|
||||
<object-type name="VIEW" editor-type="SELECTION" />
|
||||
<object-type name="PACKAGE" editor-type="SELECTION" />
|
||||
<object-type name="TYPE" editor-type="SELECTION" />
|
||||
</default-editors>
|
||||
</browser-settings>
|
||||
<navigation-settings>
|
||||
<lookup-filters>
|
||||
<lookup-objects>
|
||||
<object-type name="SCHEMA" enabled="true" />
|
||||
<object-type name="USER" enabled="false" />
|
||||
<object-type name="ROLE" enabled="false" />
|
||||
<object-type name="PRIVILEGE" enabled="false" />
|
||||
<object-type name="CHARSET" enabled="false" />
|
||||
<object-type name="TABLE" enabled="true" />
|
||||
<object-type name="VIEW" enabled="true" />
|
||||
<object-type name="JSON VIEW" enabled="true" />
|
||||
<object-type name="MATERIALIZED VIEW" enabled="true" />
|
||||
<object-type name="INDEX" enabled="true" />
|
||||
<object-type name="CONSTRAINT" enabled="true" />
|
||||
<object-type name="DATASET TRIGGER" enabled="true" />
|
||||
<object-type name="DATABASE TRIGGER" enabled="true" />
|
||||
<object-type name="SYNONYM" enabled="false" />
|
||||
<object-type name="SEQUENCE" enabled="true" />
|
||||
<object-type name="PROCEDURE" enabled="true" />
|
||||
<object-type name="FUNCTION" enabled="true" />
|
||||
<object-type name="PACKAGE" enabled="true" />
|
||||
<object-type name="TYPE" enabled="true" />
|
||||
<object-type name="JAVA CLASS" enabled="true" />
|
||||
<object-type name="INNER CLASS" enabled="true" />
|
||||
<object-type name="JAVA FIELD" enabled="true" />
|
||||
<object-type name="JAVA METHOD" enabled="true" />
|
||||
<object-type name="JAVA PARAMETER" enabled="true" />
|
||||
<object-type name="JAVA RESOURCE" enabled="true" />
|
||||
<object-type name="DIMENSION" enabled="false" />
|
||||
<object-type name="CLUSTER" enabled="false" />
|
||||
<object-type name="DBLINK" enabled="false" />
|
||||
<object-type name="CREDENTIAL" enabled="false" />
|
||||
</lookup-objects>
|
||||
<force-database-load value="false" />
|
||||
<prompt-connection-selection value="true" />
|
||||
<prompt-schema-selection value="true" />
|
||||
</lookup-filters>
|
||||
</navigation-settings>
|
||||
<dataset-grid-settings>
|
||||
<general>
|
||||
<enable-zooming value="true" />
|
||||
<enable-column-tooltip value="true" />
|
||||
</general>
|
||||
<sorting>
|
||||
<nulls-first value="true" />
|
||||
<max-sorting-columns value="4" />
|
||||
</sorting>
|
||||
<audit-columns>
|
||||
<column-names value="" />
|
||||
<visible value="true" />
|
||||
<editable value="false" />
|
||||
</audit-columns>
|
||||
</dataset-grid-settings>
|
||||
<dataset-editor-settings>
|
||||
<text-editor-popup>
|
||||
<active value="false" />
|
||||
<active-if-empty value="false" />
|
||||
<data-length-threshold value="100" />
|
||||
<popup-delay value="1000" />
|
||||
</text-editor-popup>
|
||||
<values-actions-popup>
|
||||
<show-popup-button value="true" />
|
||||
<element-count-threshold value="1000" />
|
||||
<data-length-threshold value="250" />
|
||||
</values-actions-popup>
|
||||
<general>
|
||||
<fetch-block-size value="100" />
|
||||
<fetch-timeout value="30" />
|
||||
<trim-whitespaces value="true" />
|
||||
<convert-empty-strings-to-null value="true" />
|
||||
<select-content-on-cell-edit value="true" />
|
||||
<large-value-preview-active value="true" />
|
||||
</general>
|
||||
<filters>
|
||||
<prompt-filter-dialog value="true" />
|
||||
<default-filter-type value="BASIC" />
|
||||
</filters>
|
||||
<qualified-text-editor text-length-threshold="300">
|
||||
<content-types>
|
||||
<content-type name="Text" enabled="true" />
|
||||
<content-type name="Properties" enabled="true" />
|
||||
<content-type name="XML" enabled="true" />
|
||||
<content-type name="DTD" enabled="true" />
|
||||
<content-type name="HTML" enabled="true" />
|
||||
<content-type name="XHTML" enabled="true" />
|
||||
<content-type name="SQL" enabled="true" />
|
||||
<content-type name="PL/SQL" enabled="true" />
|
||||
<content-type name="JSON" enabled="true" />
|
||||
<content-type name="JSON5" enabled="true" />
|
||||
<content-type name="YAML" enabled="true" />
|
||||
</content-types>
|
||||
</qualified-text-editor>
|
||||
<record-navigation>
|
||||
<navigation-target value="VIEWER" />
|
||||
</record-navigation>
|
||||
</dataset-editor-settings>
|
||||
<code-editor-settings>
|
||||
<general>
|
||||
<show-object-navigation-gutter value="false" />
|
||||
<show-spec-declaration-navigation-gutter value="true" />
|
||||
<enable-spellchecking value="true" />
|
||||
<enable-reference-spellchecking value="false" />
|
||||
</general>
|
||||
<confirmations>
|
||||
<save-changes value="false" />
|
||||
<revert-changes value="true" />
|
||||
<exit-on-changes value="ASK" />
|
||||
</confirmations>
|
||||
</code-editor-settings>
|
||||
<code-completion-settings>
|
||||
<filters>
|
||||
<basic-filter>
|
||||
<filter-element type="RESERVED_WORD" id="keyword" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="function" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="parameter" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="datatype" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="exception" selected="true" />
|
||||
<filter-element type="OBJECT" id="schema" selected="true" />
|
||||
<filter-element type="OBJECT" id="role" selected="true" />
|
||||
<filter-element type="OBJECT" id="user" selected="true" />
|
||||
<filter-element type="OBJECT" id="privilege" selected="true" />
|
||||
<user-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="json view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="false" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</user-schema>
|
||||
<public-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="false" />
|
||||
<filter-element type="OBJECT" id="view" selected="false" />
|
||||
<filter-element type="OBJECT" id="json view" selected="false" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="false" />
|
||||
<filter-element type="OBJECT" id="index" selected="false" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="false" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="false" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="false" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="false" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="false" />
|
||||
<filter-element type="OBJECT" id="function" selected="false" />
|
||||
<filter-element type="OBJECT" id="package" selected="false" />
|
||||
<filter-element type="OBJECT" id="type" selected="false" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="false" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="false" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="false" />
|
||||
</public-schema>
|
||||
<any-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="json view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</any-schema>
|
||||
</basic-filter>
|
||||
<extended-filter>
|
||||
<filter-element type="RESERVED_WORD" id="keyword" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="function" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="parameter" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="datatype" selected="true" />
|
||||
<filter-element type="RESERVED_WORD" id="exception" selected="true" />
|
||||
<filter-element type="OBJECT" id="schema" selected="true" />
|
||||
<filter-element type="OBJECT" id="user" selected="true" />
|
||||
<filter-element type="OBJECT" id="role" selected="true" />
|
||||
<filter-element type="OBJECT" id="privilege" selected="true" />
|
||||
<user-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="json view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</user-schema>
|
||||
<public-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="json view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</public-schema>
|
||||
<any-schema>
|
||||
<filter-element type="OBJECT" id="table" selected="true" />
|
||||
<filter-element type="OBJECT" id="view" selected="true" />
|
||||
<filter-element type="OBJECT" id="json view" selected="true" />
|
||||
<filter-element type="OBJECT" id="materialized view" selected="true" />
|
||||
<filter-element type="OBJECT" id="index" selected="true" />
|
||||
<filter-element type="OBJECT" id="constraint" selected="true" />
|
||||
<filter-element type="OBJECT" id="trigger" selected="true" />
|
||||
<filter-element type="OBJECT" id="synonym" selected="true" />
|
||||
<filter-element type="OBJECT" id="sequence" selected="true" />
|
||||
<filter-element type="OBJECT" id="procedure" selected="true" />
|
||||
<filter-element type="OBJECT" id="function" selected="true" />
|
||||
<filter-element type="OBJECT" id="package" selected="true" />
|
||||
<filter-element type="OBJECT" id="type" selected="true" />
|
||||
<filter-element type="OBJECT" id="dimension" selected="true" />
|
||||
<filter-element type="OBJECT" id="cluster" selected="true" />
|
||||
<filter-element type="OBJECT" id="dblink" selected="true" />
|
||||
</any-schema>
|
||||
</extended-filter>
|
||||
</filters>
|
||||
<sorting enabled="true">
|
||||
<sorting-element type="RESERVED_WORD" id="keyword" />
|
||||
<sorting-element type="RESERVED_WORD" id="datatype" />
|
||||
<sorting-element type="OBJECT" id="column" />
|
||||
<sorting-element type="OBJECT" id="table" />
|
||||
<sorting-element type="OBJECT" id="view" />
|
||||
<sorting-element type="OBJECT" id="json view" />
|
||||
<sorting-element type="OBJECT" id="materialized view" />
|
||||
<sorting-element type="OBJECT" id="index" />
|
||||
<sorting-element type="OBJECT" id="constraint" />
|
||||
<sorting-element type="OBJECT" id="trigger" />
|
||||
<sorting-element type="OBJECT" id="synonym" />
|
||||
<sorting-element type="OBJECT" id="sequence" />
|
||||
<sorting-element type="OBJECT" id="procedure" />
|
||||
<sorting-element type="OBJECT" id="function" />
|
||||
<sorting-element type="OBJECT" id="package" />
|
||||
<sorting-element type="OBJECT" id="type" />
|
||||
<sorting-element type="OBJECT" id="dimension" />
|
||||
<sorting-element type="OBJECT" id="cluster" />
|
||||
<sorting-element type="OBJECT" id="dblink" />
|
||||
<sorting-element type="OBJECT" id="schema" />
|
||||
<sorting-element type="OBJECT" id="role" />
|
||||
<sorting-element type="OBJECT" id="user" />
|
||||
<sorting-element type="RESERVED_WORD" id="function" />
|
||||
<sorting-element type="RESERVED_WORD" id="parameter" />
|
||||
</sorting>
|
||||
<format>
|
||||
<enforce-code-style-case value="true" />
|
||||
</format>
|
||||
</code-completion-settings>
|
||||
<execution-engine-settings>
|
||||
<statement-execution>
|
||||
<fetch-block-size value="100" />
|
||||
<execution-timeout value="20" />
|
||||
<debug-execution-timeout value="600" />
|
||||
<focus-result value="false" />
|
||||
<prompt-execution value="false" />
|
||||
</statement-execution>
|
||||
<script-execution>
|
||||
<command-line-interfaces />
|
||||
<execution-timeout value="300" />
|
||||
</script-execution>
|
||||
<method-execution>
|
||||
<execution-timeout value="30" />
|
||||
<debug-execution-timeout value="600" />
|
||||
<parameter-history-size value="10" />
|
||||
</method-execution>
|
||||
</execution-engine-settings>
|
||||
<operation-settings>
|
||||
<transactions>
|
||||
<uncommitted-changes>
|
||||
<on-project-close value="ASK" />
|
||||
<on-disconnect value="ASK" />
|
||||
<on-autocommit-toggle value="ASK" />
|
||||
</uncommitted-changes>
|
||||
<multiple-uncommitted-changes>
|
||||
<on-commit value="ASK" />
|
||||
<on-rollback value="ASK" />
|
||||
</multiple-uncommitted-changes>
|
||||
</transactions>
|
||||
<session-browser>
|
||||
<disconnect-session value="ASK" />
|
||||
<kill-session value="ASK" />
|
||||
<reload-on-filter-change value="false" />
|
||||
</session-browser>
|
||||
<compiler>
|
||||
<compile-type value="KEEP" />
|
||||
<compile-dependencies value="ASK" />
|
||||
<always-show-controls value="false" />
|
||||
</compiler>
|
||||
</operation-settings>
|
||||
<ddl-file-settings>
|
||||
<extensions>
|
||||
<mapping file-type-id="VIEW" extensions="vw" />
|
||||
<mapping file-type-id="TRIGGER" extensions="trg" />
|
||||
<mapping file-type-id="PROCEDURE" extensions="prc" />
|
||||
<mapping file-type-id="FUNCTION" extensions="fnc" />
|
||||
<mapping file-type-id="PACKAGE" extensions="pkg" />
|
||||
<mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
|
||||
<mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
|
||||
<mapping file-type-id="TYPE" extensions="tpe" />
|
||||
<mapping file-type-id="TYPE_SPEC" extensions="tps" />
|
||||
<mapping file-type-id="TYPE_BODY" extensions="tpb" />
|
||||
<mapping file-type-id="JAVA_SOURCE" extensions="sql" />
|
||||
</extensions>
|
||||
<general>
|
||||
<lookup-ddl-files value="true" />
|
||||
<create-ddl-files value="false" />
|
||||
<synchronize-ddl-files value="true" />
|
||||
<use-qualified-names value="false" />
|
||||
<make-scripts-rerunnable value="true" />
|
||||
</general>
|
||||
</ddl-file-settings>
|
||||
<assistant-settings>
|
||||
<credential-settings>
|
||||
<credentials />
|
||||
</credential-settings>
|
||||
</assistant-settings>
|
||||
<general-settings>
|
||||
<regional-settings>
|
||||
<date-format value="MEDIUM" />
|
||||
<number-format value="UNGROUPED" />
|
||||
<locale value="SYSTEM_DEFAULT" />
|
||||
<use-custom-formats value="false" />
|
||||
</regional-settings>
|
||||
<environment>
|
||||
<environment-types>
|
||||
<environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
|
||||
<environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
|
||||
<environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
|
||||
<environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
|
||||
</environment-types>
|
||||
<visibility-settings>
|
||||
<connection-tabs value="true" />
|
||||
<dialog-headers value="true" />
|
||||
<object-editor-tabs value="true" />
|
||||
<script-editor-tabs value="false" />
|
||||
<execution-result-tabs value="true" />
|
||||
</visibility-settings>
|
||||
</environment>
|
||||
</general-settings>
|
||||
</component>
|
||||
</project>
|
||||
44
.idea/inspectionProfiles/Project_Default.xml
generated
44
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,44 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="myValues">
|
||||
<value>
|
||||
<list size="7">
|
||||
<item index="0" class="java.lang.String" itemvalue="nobr" />
|
||||
<item index="1" class="java.lang.String" itemvalue="noembed" />
|
||||
<item index="2" class="java.lang.String" itemvalue="comment" />
|
||||
<item index="3" class="java.lang.String" itemvalue="noscript" />
|
||||
<item index="4" class="java.lang.String" itemvalue="embed" />
|
||||
<item index="5" class="java.lang.String" itemvalue="script" />
|
||||
<item index="6" class="java.lang.String" itemvalue="span" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
<option name="myCustomValuesEnabled" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PyCompatibilityInspection" enabled="false" level="WARNING" enabled_by_default="false">
|
||||
<option name="ourVersions">
|
||||
<value>
|
||||
<list size="1">
|
||||
<item index="0" class="java.lang.String" itemvalue="3.13" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
|
||||
<option name="ignoredNames">
|
||||
<list>
|
||||
<option value="format" />
|
||||
</list>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoredIdentifiers">
|
||||
<list>
|
||||
<option value="type.*" />
|
||||
</list>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
6
.idea/inspectionProfiles/profiles_settings.xml
generated
6
.idea/inspectionProfiles/profiles_settings.xml
generated
@@ -1,6 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
7
.idea/misc.xml
generated
7
.idea/misc.xml
generated
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.13" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 virtualenv at C:\Users\Algiz_N\PycharmProjects\stcs\.venv" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
8
.idea/modules.xml
generated
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/stcs.iml" filepath="$PROJECT_DIR$/.idea/stcs.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/stcs.iml
generated
8
.idea/stcs.iml
generated
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.13 virtualenv at C:\Users\Algiz_N\PycharmProjects\stcs\.venv" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -37,7 +37,10 @@ async def main() -> None:
|
||||
dp.include_router(router_register_bybit_api)
|
||||
dp.include_router(router_functions_bybit_trade)
|
||||
|
||||
await dp.start_polling(bot)
|
||||
try:
|
||||
await dp.start_polling(bot)
|
||||
except asyncio.CancelledError:
|
||||
logger.info("Bot is off")
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
57
README.md
57
README.md
@@ -2,7 +2,7 @@ Crypto Trading Telegram Bot
|
||||
|
||||
Этот бот — автоматизированный торговый помощник для работы с криптовалютной биржей Bybit на основе стратегии мартингейла. Он позволяет торговать бессрочными контрактами с управлением рисками, тейк-профитами, стоп-лоссами и кредитным плечом.
|
||||
|
||||
##Основные возможности
|
||||
## Основные возможности
|
||||
|
||||
- Поддержка работы с биржей Bybit через официальный API.
|
||||
|
||||
@@ -27,28 +27,67 @@ Crypto Trading Telegram Bot
|
||||
- Хранение пользовательских настроек и статистики в базе данных.
|
||||
|
||||
|
||||
##Установка и запуск
|
||||
## Установка
|
||||
|
||||
1. Клонируйте репозиторий:
|
||||
|
||||
|
||||
git clone <URL_репозитория>
|
||||
|
||||
```bash
|
||||
git clone https://git.svoboda.works/kodorvan/stcs
|
||||
```
|
||||
|
||||
2. Установите зависимости:
|
||||
|
||||
```bash
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
или для отдельного пользователя
|
||||
```bash
|
||||
sudo -u www-data /usr/bin/pip install -r requirements.txt
|
||||
```
|
||||
|
||||
3. Зарегистрируйте чат-робота и сгенерируйте ключ авторизации<br>
|
||||
[@BotFather](https://t.me/BotFather)
|
||||
|
||||
3. Создайте файл .env и настройте переменные окружения.
|
||||
4. Создайте файл .env и настройте переменные окружения
|
||||
```bash
|
||||
cp .env.sample .env
|
||||
nvim .env
|
||||
```
|
||||
|
||||
5. Запустите бота:
|
||||
|
||||
4. Запустите бота:
|
||||
|
||||
```bash
|
||||
python BybitBot_API.py
|
||||
```
|
||||
|
||||
## Настройка автономной работы
|
||||
1. Создаём файл конфигурации SystemD
|
||||
```bash
|
||||
sudo cp examples/systemd/stcs.service /etc/systemd/system/
|
||||
```
|
||||
|
||||
##Настройки пользователя
|
||||
2. Настраиваем его
|
||||
```bash
|
||||
nvim /etc/systemd/system/stcs.service
|
||||
```
|
||||
|
||||
3. Добавляем в автозапуск
|
||||
```bash
|
||||
sudo systemctl enable stcs
|
||||
```
|
||||
|
||||
4. Запускаем
|
||||
```bash
|
||||
sudo service stcs start
|
||||
```
|
||||
|
||||
5. Проверяем
|
||||
```bash
|
||||
sudo service stcs status
|
||||
```
|
||||
|
||||
## Настройки пользователя
|
||||
|
||||
- Кредитное плечо (например, 15x)
|
||||
|
||||
@@ -67,7 +106,7 @@ python BybitBot_API.py
|
||||
- Таймеры для старта и закрытия сделок
|
||||
|
||||
|
||||
##Безопасность и риски
|
||||
## Безопасность и риски
|
||||
|
||||
- Бот требует аккуратной настройки параметров риска.
|
||||
|
||||
|
||||
@@ -262,6 +262,9 @@ async def handle_execution_message(message, msg):
|
||||
float(martingale_factor) ** current_martingale_step
|
||||
)
|
||||
await rq.update_martingale_step(tg_id, current_martingale)
|
||||
await message.answer(
|
||||
f"❗️ Сделка закрылась в минус, открываю новую сделку с увеличенной ставкой.\n"
|
||||
)
|
||||
await open_position(
|
||||
tg_id,
|
||||
message,
|
||||
@@ -367,6 +370,10 @@ async def open_position(
|
||||
|
||||
balance = await balance_g.get_balance(tg_id, message)
|
||||
if safe_float(balance) < total_budget:
|
||||
logger.error(
|
||||
f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. "
|
||||
f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT."
|
||||
)
|
||||
await message.answer(
|
||||
f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. "
|
||||
f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT.",
|
||||
@@ -387,7 +394,7 @@ async def open_position(
|
||||
await error_max_risk(message)
|
||||
return
|
||||
|
||||
if max_martingale_steps == current_martingale:
|
||||
if max_martingale_steps < current_martingale:
|
||||
await error_max_step(message)
|
||||
return
|
||||
|
||||
@@ -431,6 +438,11 @@ async def open_position(
|
||||
|
||||
order_value = float(quantity) * price_for_calc
|
||||
if order_value < min_order_value:
|
||||
logger.error(
|
||||
f"Сумма ордера слишком мала: {order_value:.2f} USDT. "
|
||||
f"Минимум для торговли — {min_order_value} USDT. "
|
||||
f"Пожалуйста, увеличьте количество позиций."
|
||||
)
|
||||
await message.answer(
|
||||
f"Сумма ордера слишком мала: {order_value:.2f} USDT. "
|
||||
f"Минимум для торговли — {min_order_value} USDT. "
|
||||
@@ -581,6 +593,7 @@ async def open_position(
|
||||
await message.answer("Недостаточно средств для нового ордера",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
else:
|
||||
logger.error("Ошибка при совершении сделки: %s", e)
|
||||
await message.answer(
|
||||
"Недостаточно средств для размещения нового ордера с заданным количеством и плечом.",
|
||||
reply_markup=inline_markup.back_to_main,
|
||||
@@ -593,37 +606,6 @@ async def open_position(
|
||||
)
|
||||
|
||||
|
||||
async def trading_cycle(tg_id, message, side, margin_mode, symbol, starting_quantity):
|
||||
"""
|
||||
Цикл торговой логики с учётом таймера пользователя.
|
||||
"""
|
||||
try:
|
||||
timer_data = await rq.get_user_timer(tg_id)
|
||||
timer_min = 0
|
||||
if isinstance(timer_data, dict):
|
||||
timer_min = timer_data.get("timer_minutes") or timer_data.get("timer") or 0
|
||||
else:
|
||||
timer_min = timer_data or 0
|
||||
|
||||
timer_sec = timer_min * 60
|
||||
|
||||
if timer_sec > 0:
|
||||
await asyncio.sleep(timer_sec)
|
||||
|
||||
await open_position(
|
||||
tg_id,
|
||||
message,
|
||||
side=side,
|
||||
margin_mode=margin_mode,
|
||||
symbol=symbol,
|
||||
quantity=starting_quantity,
|
||||
)
|
||||
except asyncio.CancelledError:
|
||||
logger.info(
|
||||
f"Торговый цикл для пользователя {tg_id} был отменён.", exc_info=True
|
||||
)
|
||||
|
||||
|
||||
async def set_take_profit_stop_loss(
|
||||
tg_id: int,
|
||||
message,
|
||||
@@ -643,7 +625,7 @@ async def set_take_profit_stop_loss(
|
||||
client.set_tp_sl_mode(symbol=symbol, category="linear", tpSlMode=tpsl_mode)
|
||||
except exceptions.InvalidRequestError as e:
|
||||
if "same tp sl mode" in str(e).lower():
|
||||
logger.info(f"Режим TP/SL уже установлен для {symbol}")
|
||||
logger.info("Режим TP/SL уже установлен для %s - пропускаем", symbol)
|
||||
else:
|
||||
raise
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ from logger_helper.logger_helper import LOGGING_CONFIG
|
||||
from app.services.Bybit.functions.Futures import (close_user_trade, set_take_profit_stop_loss, \
|
||||
get_active_positions_by_symbol, get_active_orders_by_symbol,
|
||||
get_active_positions, get_active_orders, cancel_all_tp_sl_orders,
|
||||
trading_cycle, open_position, close_trade_after_delay, safe_float,
|
||||
open_position, close_trade_after_delay, safe_float,
|
||||
)
|
||||
from app.services.Bybit.functions.balance import get_balance
|
||||
import app.telegram.Keyboards.inline_keyboards as inline_markup
|
||||
@@ -29,6 +29,8 @@ logger = logging.getLogger("functions")
|
||||
|
||||
router_functions_bybit_trade = Router()
|
||||
|
||||
user_trade_tasks = {}
|
||||
|
||||
|
||||
@router_functions_bybit_trade.callback_query(F.data.in_(['clb_start_trading', 'clb_back_to_main', 'back_to_main']))
|
||||
async def clb_start_bybit_trade_message(callback: CallbackQuery) -> None:
|
||||
@@ -63,7 +65,6 @@ async def start_bybit_trade_message(message: Message) -> None:
|
||||
"""
|
||||
balance = await get_balance(message.from_user.id, message)
|
||||
tg_id = message.from_user.id
|
||||
await run_ws_for_user(tg_id, message)
|
||||
|
||||
if balance:
|
||||
await run_ws_for_user(tg_id, message)
|
||||
@@ -72,7 +73,7 @@ async def start_bybit_trade_message(message: Message) -> None:
|
||||
|
||||
text = (
|
||||
f"💎 Торговля на Bybit\n\n"
|
||||
f"⚖️ Ваш баланс (USDT): {balance}\n"
|
||||
f"⚖️ Ваш баланс (USDT): {float(balance):.2f}\n"
|
||||
f"📊 Текущая торговая пара: {symbol}\n"
|
||||
f"$$$ Цена: {price}\n\n"
|
||||
"Как начать торговлю?\n\n"
|
||||
@@ -154,7 +155,7 @@ async def entry_order_type_callback(callback: CallbackQuery, state: FSMContext)
|
||||
reply_markup=inline_markup.start_trading_markup)
|
||||
await callback.answer()
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при обновлении типа входа в позицию: {e}")
|
||||
logger.error("Произошла ошибка при обновлении типа входа в позицию: %s", e)
|
||||
await callback.message.answer("Произошла ошибка при обновлении типа входа в позицию",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
await state.clear()
|
||||
@@ -229,14 +230,41 @@ async def start_trading_process(callback: CallbackQuery) -> None:
|
||||
timer_minute = timer_data or 0
|
||||
|
||||
if timer_minute > 0:
|
||||
await message.answer(f"Торговля начнётся через {timer_minute} мин.")
|
||||
await trading_cycle(tg_id, message, side=side, margin_mode=margin_mode, symbol=symbol,
|
||||
starting_quantity=starting_quantity)
|
||||
await rq.update_user_timer(tg_id, minutes=0)
|
||||
await message.answer(f"Торговля начнётся через {timer_minute} мин.", reply_markup=inline_markup.cancel_start)
|
||||
|
||||
async def delay_start():
|
||||
try:
|
||||
await asyncio.sleep(timer_minute * 60)
|
||||
await open_position(tg_id, message, side, margin_mode, symbol=symbol, quantity=starting_quantity)
|
||||
await rq.update_user_timer(tg_id, minutes=0)
|
||||
except asyncio.exceptions.CancelledError:
|
||||
logger.exception(f"Торговый цикл для пользователя {tg_id} был отменён.")
|
||||
raise
|
||||
|
||||
task = asyncio.create_task(delay_start())
|
||||
user_trade_tasks[tg_id] = task
|
||||
else:
|
||||
await open_position(tg_id, message, side, margin_mode, symbol=symbol, quantity=starting_quantity)
|
||||
|
||||
|
||||
@router_functions_bybit_trade.callback_query(F.data == "clb_cancel_start")
|
||||
async def cancel_start_trading(callback: CallbackQuery):
|
||||
tg_id = callback.from_user.id
|
||||
task = user_trade_tasks.get(tg_id)
|
||||
if task and not task.done():
|
||||
task.cancel()
|
||||
try:
|
||||
await task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
user_trade_tasks.pop(tg_id, None)
|
||||
await rq.update_user_timer(tg_id, minutes=0)
|
||||
await callback.message.answer("Запуск торговли отменён.", reply_markup=inline_markup.back_to_main)
|
||||
await callback.message.edit_reply_markup(reply_markup=None)
|
||||
else:
|
||||
await callback.answer("Нет запланированной задачи запуска.", show_alert=True)
|
||||
|
||||
|
||||
@router_functions_bybit_trade.callback_query(F.data == "clb_my_deals")
|
||||
async def show_my_trades(callback: CallbackQuery) -> None:
|
||||
"""
|
||||
@@ -244,10 +272,10 @@ async def show_my_trades(callback: CallbackQuery) -> None:
|
||||
"""
|
||||
await callback.answer()
|
||||
try:
|
||||
await callback.message.answer(f"Выберите тип сделки:",
|
||||
await callback.message.answer("Выберите тип сделки:",
|
||||
reply_markup=inline_markup.my_deals_select_markup)
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при выборе типа сделки: {e}")
|
||||
logger.error("Произошла ошибка при выборе типа сделки: %s", e)
|
||||
|
||||
|
||||
@router_functions_bybit_trade.callback_query(F.data == "clb_open_deals")
|
||||
@@ -260,7 +288,7 @@ async def show_my_trades_callback(callback: CallbackQuery):
|
||||
try:
|
||||
await get_active_positions(callback.from_user.id, message=callback.message)
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при выборе сделки: {e}")
|
||||
logger.error("Произошла ошибка при выборе сделки: %s", e)
|
||||
await callback.message.answer("Произошла ошибка при выборе сделки", reply_markup=inline_markup.back_to_main)
|
||||
|
||||
|
||||
@@ -276,7 +304,7 @@ async def show_deal_callback(callback_query: CallbackQuery) -> None:
|
||||
tg_id = callback_query.from_user.id
|
||||
await get_active_positions_by_symbol(tg_id, symbol, message=callback_query.message)
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при выборе сделки: {e}")
|
||||
logger.error("Произошла ошибка при выборе сделки: %s", e)
|
||||
await callback_query.message.answer("Произошла ошибка при выборе сделки",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
|
||||
@@ -291,7 +319,7 @@ async def show_my_orders_callback(callback: CallbackQuery) -> None:
|
||||
try:
|
||||
await get_active_orders(callback.from_user.id, message=callback.message)
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при выборе ордера: {e}")
|
||||
logger.error("Произошла ошибка при выборе ордера: %s", e)
|
||||
await callback.message.answer("Произошла ошибка при выборе ордера", reply_markup=inline_markup.back_to_main)
|
||||
|
||||
|
||||
@@ -307,7 +335,7 @@ async def show_limit_callback(callback_query: CallbackQuery) -> None:
|
||||
tg_id = callback_query.from_user.id
|
||||
await get_active_orders_by_symbol(tg_id, symbol, message=callback_query.message)
|
||||
except Exception as e:
|
||||
logger.error(f"Произошла ошибка при выборе сделки: {e}")
|
||||
logger.error("Произошла ошибка при выборе сделки: %s", e)
|
||||
await callback_query.message.answer("Произошла ошибка при выборе сделки",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
|
||||
@@ -443,7 +471,8 @@ async def process_close_delay(message: Message, state: FSMContext) -> None:
|
||||
symbol = data.get("symbol")
|
||||
|
||||
delay = delay_minutes * 60
|
||||
await message.answer(f"Закрытие сделки {symbol} запланировано через {delay_minutes} мин.", reply_markup=inline_markup.back_to_main)
|
||||
await message.answer(f"Закрытие сделки {symbol} запланировано через {delay_minutes} мин.",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
await close_trade_after_delay(message.from_user.id, message, symbol, delay)
|
||||
await state.clear()
|
||||
|
||||
@@ -454,7 +483,7 @@ async def reset_martingale(callback: CallbackQuery) -> None:
|
||||
Сбрасывает шаги мартингейла пользователя.
|
||||
"""
|
||||
tg_id = callback.from_user.id
|
||||
await rq.update_martingale_step(tg_id, 0)
|
||||
await rq.update_martingale_step(tg_id, 1)
|
||||
await callback.answer("Сброс шагов выполнен.")
|
||||
await main_settings_message(tg_id, callback.message)
|
||||
|
||||
@@ -511,7 +540,8 @@ async def process_stop_delay(message: Message, state: FSMContext):
|
||||
tg_id = message.from_user.id
|
||||
delay_seconds = delay_minutes * 60
|
||||
|
||||
await message.answer(f"Торговля будет остановлена через {delay_minutes} минут.", reply_markup=inline_markup.back_to_main)
|
||||
await message.answer(f"Торговля будет остановлена через {delay_minutes} минут.",
|
||||
reply_markup=inline_markup.back_to_main)
|
||||
await asyncio.sleep(delay_seconds)
|
||||
await rq.update_trigger(tg_id, "Ручной")
|
||||
await message.answer("Автоматическая торговля остановлена.", reply_markup=inline_markup.back_to_main)
|
||||
@@ -524,6 +554,9 @@ async def cancel(callback: CallbackQuery, state: FSMContext) -> None:
|
||||
"""
|
||||
Отменяет текущее состояние FSM и сообщает пользователю об отмене.
|
||||
"""
|
||||
await state.clear()
|
||||
await callback.message.answer("Отменено!", reply_markup=inline_markup.back_to_main)
|
||||
await callback.answer()
|
||||
try:
|
||||
await state.clear()
|
||||
await callback.message.answer("Отменено!", reply_markup=inline_markup.back_to_main)
|
||||
await callback.answer()
|
||||
except Exception as e:
|
||||
logger.error("Ошибка при обработке отмены: %s", e)
|
||||
@@ -9,6 +9,10 @@ settings_markup = InlineKeyboardMarkup(inline_keyboard=[
|
||||
[InlineKeyboardButton(text="Запуск", callback_data='clb_start_trading')]
|
||||
])
|
||||
|
||||
cancel_start = InlineKeyboardMarkup(inline_keyboard=[
|
||||
[InlineKeyboardButton(text="Отменить запуск", callback_data="clb_cancel_start")]
|
||||
])
|
||||
|
||||
back_btn_list_settings = [InlineKeyboardButton(text="Назад",
|
||||
callback_data='clb_back_to_special_settings_message')] # Кнопка для возврата к списку каталога настроек
|
||||
back_btn_list_settings_markup = InlineKeyboardMarkup(inline_keyboard=[[InlineKeyboardButton(text="Назад",
|
||||
@@ -46,10 +50,8 @@ trading_markup = InlineKeyboardMarkup(inline_keyboard=[
|
||||
])
|
||||
|
||||
start_trading_markup = InlineKeyboardMarkup(inline_keyboard=[
|
||||
[InlineKeyboardButton(text="На главную", callback_data='back_to_main')],
|
||||
[InlineKeyboardButton(text="Начать торговлю", callback_data="clb_start_chatbot_trading")],
|
||||
[InlineKeyboardButton(text="Установить таймер", callback_data="clb_set_timer")],
|
||||
|
||||
[InlineKeyboardButton(text="На главную", callback_data='back_to_main')],
|
||||
])
|
||||
|
||||
cancel = InlineKeyboardMarkup(inline_keyboard=[
|
||||
@@ -196,6 +198,7 @@ def create_close_limit_markup(symbol: str) -> InlineKeyboardMarkup:
|
||||
|
||||
timer_markup = InlineKeyboardMarkup(inline_keyboard=[
|
||||
[InlineKeyboardButton(text="Установить таймер", callback_data="clb_set_timer")],
|
||||
[InlineKeyboardButton(text="Удалить таймер", callback_data="clb_delete_timer")],
|
||||
back_btn_to_main
|
||||
])
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ class User_Main_Settings(Base):
|
||||
size_leverage = mapped_column(Integer(), default=1)
|
||||
starting_quantity = mapped_column(Integer(), default=1)
|
||||
martingale_factor = mapped_column(Integer(), default=1)
|
||||
martingale_step = mapped_column(Integer(), default=0)
|
||||
martingale_step = mapped_column(Integer(), default=1)
|
||||
maximal_quantity = mapped_column(Integer(), default=10)
|
||||
entry_order_type = mapped_column(String(10), default='Market')
|
||||
limit_order_price = mapped_column(Numeric(18, 15), nullable=True)
|
||||
|
||||
@@ -29,7 +29,7 @@ async def main_settings_message(id, message):
|
||||
text = f""" <b>Условия запуска</b>
|
||||
|
||||
<b>- Режим торговли:</b> {trigger}
|
||||
<b>- Таймер: </b> установить таймер / остановить таймер
|
||||
<b>- Таймер: </b> установить таймер / удалить таймер
|
||||
"""
|
||||
await message.answer(text=text, parse_mode='html', reply_markup=inline_markup.condition_settings_markup)
|
||||
|
||||
@@ -68,7 +68,7 @@ async def timer_message(id, message: Message, state: FSMContext):
|
||||
return
|
||||
|
||||
await message.answer(
|
||||
f"Таймер: {timer_info['timer_minutes']} мин\n",
|
||||
f"Таймер установлен на: {timer_info['timer_minutes']} мин\n",
|
||||
reply_markup=inline_markup.timer_markup
|
||||
)
|
||||
|
||||
@@ -76,7 +76,7 @@ async def timer_message(id, message: Message, state: FSMContext):
|
||||
@condition_settings_router.callback_query(F.data == "clb_set_timer")
|
||||
async def set_timer_callback(callback: CallbackQuery, state: FSMContext):
|
||||
await state.set_state(condition_settings.timer) # состояние для ввода времени
|
||||
await callback.message.answer("Введите время работы в минутах (например, 60):")
|
||||
await callback.message.answer("Введите время работы в минутах (например, 60):", reply_markup=inline_markup.cancel)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@@ -89,14 +89,21 @@ async def process_timer_input(message: Message, state: FSMContext):
|
||||
return
|
||||
|
||||
await rq.update_user_timer(message.from_user.id, minutes)
|
||||
await message.answer(f"Таймер установлен на {minutes} минут.\nНажмите кнопку 'Начать торговлю' для запуска.",
|
||||
reply_markup=inline_markup.start_trading_markup)
|
||||
|
||||
logger.info("Timer set for user %s: %s minutes", message.from_user.id, minutes)
|
||||
await timer_message(message.from_user.id, message, state)
|
||||
await state.clear()
|
||||
except ValueError:
|
||||
await message.reply("Пожалуйста, введите корректное число.")
|
||||
|
||||
|
||||
@condition_settings_router.callback_query(F.data == "clb_delete_timer")
|
||||
async def delete_timer_callback(callback: CallbackQuery, state: FSMContext):
|
||||
await state.clear()
|
||||
await rq.update_user_timer(callback.from_user.id, 0)
|
||||
logger.info("Timer deleted for user %s", callback.from_user.id)
|
||||
await timer_message(callback.from_user.id, callback.message, state)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
async def filter_volatility_message(message, state):
|
||||
text = '''Фильтр волатильности
|
||||
|
||||
@@ -67,7 +67,7 @@ async def main_settings_message(id, message):
|
||||
<b>- Размер кредитного плеча:</b> х{data['size_leverage']}
|
||||
<b>- Начальная ставка:</b> {data['starting_quantity']}
|
||||
<b>- Коэффициент мартингейла:</b> {data['martingale_factor']}
|
||||
<b>- Количество ставок в серии:</b> {data['martingale_step']}
|
||||
<b>- Текущий шаг:</b> {data['martingale_step']}
|
||||
<b>- Максимальное количество ставок в серии:</b> {data['maximal_quantity']}
|
||||
|
||||
<b>- Требуемый бюджет:</b> {total_budget:.2f} USDT
|
||||
@@ -128,7 +128,7 @@ async def state_trading_mode(callback: CallbackQuery, state):
|
||||
|
||||
await state.clear()
|
||||
except Exception as e:
|
||||
logger.error(e)
|
||||
logger.error("Ошибка при обновлении режима торговли: %s", e)
|
||||
|
||||
|
||||
async def switch_mode_enabled_message(message, state):
|
||||
@@ -235,8 +235,9 @@ async def state_martingale_factor(message: Message, state):
|
||||
|
||||
await state.clear()
|
||||
else:
|
||||
val = data['martingale_factor']
|
||||
await message.answer(
|
||||
f'⛔️ Ошибка: ваше значение ({data['martingale_factor']}) или выше лимита (100) или вы вводите неверные символы')
|
||||
f"⛔️ Ошибка: ваше значение ({val}) или выше лимита (100) или вы вводите неверные символы")
|
||||
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
|
||||
@@ -276,7 +277,7 @@ async def state_margin_type(callback: CallbackQuery, state):
|
||||
|
||||
positions = active_positions.get('result', {}).get('list', [])
|
||||
except Exception as e:
|
||||
logger.error(f"error: {e}")
|
||||
logger.error("Ошибка при получении активных позиций: %s", e)
|
||||
positions = []
|
||||
|
||||
for pos in positions:
|
||||
@@ -306,7 +307,7 @@ async def state_margin_type(callback: CallbackQuery, state):
|
||||
|
||||
await state.clear()
|
||||
except Exception as e:
|
||||
logger.error(f"error: {e}")
|
||||
logger.error("Ошибка при изменении типа маржи: %s", e)
|
||||
else:
|
||||
await callback.answer()
|
||||
await main_settings_message(callback.from_user.id, callback.message)
|
||||
@@ -336,7 +337,7 @@ async def state_starting_quantity(message: Message, state):
|
||||
|
||||
await state.clear()
|
||||
else:
|
||||
await message.answer(f'⛔️ Ошибка: вы вводите неверные символы')
|
||||
await message.answer("⛔️ Ошибка: вы вводите неверные символы")
|
||||
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
|
||||
@@ -344,7 +345,7 @@ async def state_starting_quantity(message: Message, state):
|
||||
async def maximum_quantity_message(message, state):
|
||||
await state.set_state(update_main_settings.maximal_quantity)
|
||||
|
||||
await message.edit_text("Введите <b>максимальное количество серии ставок:</b>", parse_mode='html',
|
||||
await message.edit_text("Введите максимальное количество серии ставок:",
|
||||
reply_markup=inline_markup.back_btn_list_settings_markup)
|
||||
|
||||
|
||||
@@ -363,7 +364,9 @@ async def state_maximal_quantity(message: Message, state):
|
||||
|
||||
await state.clear()
|
||||
else:
|
||||
val = data['maximal_quantity']
|
||||
await message.answer(
|
||||
f'⛔️ Ошибка: ваше значение ({data['maximal_quantity']}) или выше лимита (100) или вы вводите неверные символы')
|
||||
f'⛔️ Ошибка: ваше значение ({val}) или выше лимита (100) или вы вводите неверные символы')
|
||||
logger.error(f'⛔️ Ошибка: ваше значение ({val}) или выше лимита (100) или вы вводите неверные символы')
|
||||
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
@@ -56,8 +56,9 @@ async def state_price_profit(message: Message, state):
|
||||
|
||||
await state.clear()
|
||||
else:
|
||||
val = data['price_profit']
|
||||
await message.answer(
|
||||
f'⛔️ Ошибка: ваше значение ({data['price_profit']}%) или выше лимита (100) или вы вводите неверные символы')
|
||||
f'⛔️ Ошибка: ваше значение ({val}%) или выше лимита (100) или вы вводите неверные символы')
|
||||
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
|
||||
@@ -107,8 +108,9 @@ async def state_price_loss(message: Message, state):
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
await state.clear()
|
||||
else:
|
||||
val = data['price_loss']
|
||||
await message.answer(
|
||||
f'⛔️ Ошибка: ваше значение ({data["price_loss"]}%) выше лимита (100) или содержит неверные символы')
|
||||
f'⛔️ Ошибка: ваше значение ({val}%) выше лимита (100) или содержит неверные символы')
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
|
||||
|
||||
@@ -135,8 +137,9 @@ async def state_max_risk_deal(message: Message, state):
|
||||
|
||||
await state.clear()
|
||||
else:
|
||||
val = data['max_risk_deal']
|
||||
await message.answer(
|
||||
f'⛔️ Ошибка: ваше значение ({data['max_risk_deal']}%) или выше лимита (100) или вы вводите неверные символы')
|
||||
f'⛔️ Ошибка: ваше значение ({val}%) или выше лимита (100) или вы вводите неверные символы')
|
||||
|
||||
await main_settings_message(message.from_user.id, message)
|
||||
|
||||
@@ -154,4 +157,4 @@ async def process_commission_fee_callback(callback: CallbackQuery, state):
|
||||
await callback.message.answer(f"✅ Изменено: {val}")
|
||||
await callback.answer()
|
||||
await main_settings_message(callback.from_user.id, callback.message)
|
||||
await state.clear()
|
||||
await state.clear()
|
||||
@@ -211,7 +211,7 @@ async def clb_main_settings_msg(callback: CallbackQuery, state: FSMContext) -> N
|
||||
case 'clb_change_maximum_quantity':
|
||||
await func_main_settings.maximum_quantity_message(callback.message, state)
|
||||
except Exception as e:
|
||||
logger.error(f"Error callback in main_settings match-case: {e}")
|
||||
logger.error("Error callback in main_settings match-case: %s", e)
|
||||
|
||||
|
||||
list_risk_management_settings = ['clb_change_price_profit',
|
||||
@@ -243,7 +243,7 @@ async def clb_risk_management_settings_msg(callback: CallbackQuery, state: FSMCo
|
||||
case 'commission_fee':
|
||||
await func_rmanagement_settings.commission_fee_message(callback.message, state)
|
||||
except Exception as e:
|
||||
logger.error(f"Error callback in risk_management match-case: {e}")
|
||||
logger.error("Error callback in risk_management match-case: %s", e)
|
||||
|
||||
|
||||
list_condition_settings = ['clb_change_mode',
|
||||
@@ -284,7 +284,7 @@ async def clb_condition_settings_msg(callback: CallbackQuery, state: FSMContext)
|
||||
case 'clb_change_ai_analytics':
|
||||
await func_condition_settings.ai_analytics_message(callback.message, state)
|
||||
except Exception as e:
|
||||
logger.error(f"Error callback in main_settings match-case: {e}")
|
||||
logger.error("Error callback in main_settings match-case: %s", e)
|
||||
|
||||
|
||||
list_additional_settings = ['clb_change_save_pattern',
|
||||
@@ -313,4 +313,4 @@ async def clb_additional_settings_msg(callback: CallbackQuery, state: FSMContext
|
||||
case 'clb_change_notifications':
|
||||
await func_additional_settings.notifications_message(callback.message, state)
|
||||
except Exception as e:
|
||||
logger.error(f"Error callback in additional_settings match-case: {e}")
|
||||
logger.error("Error callback in additional_settings match-case: %s", e)
|
||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
17
examples/systemd/stcs.service
Normal file
17
examples/systemd/stcs.service
Normal file
@@ -0,0 +1,17 @@
|
||||
[Unit]
|
||||
Description=Telegram chat-robot: @stcs_cryptobot
|
||||
|
||||
Wants=network.target
|
||||
After=syslog.target network-online.target
|
||||
|
||||
[Service]
|
||||
ExecStart=sudo -u www-data /usr/bin/python3 /var/www/stcs/BybitBot_API.py
|
||||
PIDFile=/var/run/python/stcs.pid
|
||||
RemainAfterExit=no
|
||||
RuntimeMaxSec=3600s
|
||||
Restart=always
|
||||
RestartSec=5s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
@@ -80,7 +80,7 @@ LOGGING_CONFIG = {
|
||||
"level": "DEBUG",
|
||||
"propagate": False,
|
||||
},
|
||||
"conditions_settings": {
|
||||
"condition_settings": {
|
||||
"handlers": ["console", "timed_rotating_file"],
|
||||
"level": "DEBUG",
|
||||
"propagate": False,
|
||||
|
||||
1
logger_helper/loggers/.gitignore
vendored
Normal file
1
logger_helper/loggers/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.log
|
||||
@@ -1,35 +0,0 @@
|
||||
2025-08-23 12:57:26 - main - INFO - Bot is off
|
||||
2025-08-23 13:04:01 - main - INFO - Bot is off
|
||||
2025-08-23 13:25:04 - main - INFO - Bot is off
|
||||
2025-08-23 13:26:24 - main - INFO - Bot is off
|
||||
2025-08-23 13:28:36 - main - INFO - Bot is off
|
||||
2025-08-23 13:29:29 - main - INFO - Bot is off
|
||||
2025-08-23 13:30:48 - main - INFO - Bot is off
|
||||
2025-08-23 13:31:43 - main - INFO - Bot is off
|
||||
2025-08-23 13:33:10 - main - INFO - Bot is off
|
||||
2025-08-23 13:34:59 - main - INFO - Bot is off
|
||||
2025-08-23 13:36:15 - main - INFO - Bot is off
|
||||
2025-08-23 13:49:17 - main - INFO - Bot is off
|
||||
2025-08-23 13:50:22 - main - INFO - Bot is on
|
||||
2025-08-23 13:51:30 - main - INFO - Bot is off
|
||||
2025-08-23 13:51:37 - main - INFO - Bot is on
|
||||
2025-08-23 13:52:12 - main - INFO - Bot is off
|
||||
2025-08-23 13:57:48 - main - INFO - Bot is on
|
||||
2025-08-23 14:05:36 - main - INFO - Bot is off
|
||||
2025-08-23 14:05:43 - main - INFO - Bot is on
|
||||
2025-08-23 14:06:03 - main - INFO - Bot is off
|
||||
2025-08-23 14:06:46 - main - INFO - Bot is on
|
||||
2025-08-23 14:07:04 - requests - INFO - Bybit был успешно подключен
|
||||
2025-08-23 14:07:43 - requests - INFO - Новый пользователь был добавлен в бд
|
||||
2025-08-23 14:07:43 - requests - INFO - Основные настройки нового пользователя были заполнены
|
||||
2025-08-23 14:07:43 - requests - INFO - Риск-Менеджмент настройки нового пользователя были заполнены
|
||||
2025-08-23 14:07:43 - requests - INFO - Условные настройки нового пользователя были заполнены
|
||||
2025-08-23 14:07:43 - requests - INFO - Дополнительные настройки нового пользователя были заполнены
|
||||
2025-08-23 14:23:31 - main - INFO - Bot is off
|
||||
2025-08-23 14:23:39 - main - INFO - Bot is on
|
||||
2025-08-23 14:28:13 - main - INFO - Bot is off
|
||||
2025-08-23 14:28:19 - main - INFO - Bot is on
|
||||
2025-08-23 14:28:26 - requests - INFO - Получение риск-менеджмента настроек пользователя 899674724
|
||||
2025-08-23 14:28:26 - requests - INFO - Получение риск-менеджмента настроек пользователя 899674724
|
||||
2025-08-23 14:29:12 - requests - INFO - Получение риск-менеджмента настроек пользователя 899674724
|
||||
2025-08-23 14:29:34 - main - INFO - Bot is off
|
||||
@@ -6,22 +6,40 @@ aiosignal==1.4.0
|
||||
aiosqlite==0.21.0
|
||||
annotated-types==0.7.0
|
||||
attrs==25.3.0
|
||||
black==25.1.0
|
||||
certifi==2025.8.3
|
||||
charset-normalizer==3.4.3
|
||||
click==8.2.1
|
||||
colorama==0.4.6
|
||||
dotenv==0.9.9
|
||||
flake8==7.3.0
|
||||
flake8-bugbear==24.12.12
|
||||
flake8-pie==0.16.0
|
||||
frozenlist==1.7.0
|
||||
greenlet==3.2.4
|
||||
idna==3.10
|
||||
isort==6.0.1
|
||||
magic-filter==1.0.12
|
||||
mando==0.7.1
|
||||
mccabe==0.7.0
|
||||
multidict==6.6.4
|
||||
mypy_extensions==1.1.0
|
||||
nest-asyncio==1.6.0
|
||||
packaging==25.0
|
||||
pathspec==0.12.1
|
||||
platformdirs==4.4.0
|
||||
propcache==0.3.2
|
||||
pybit==5.11.0
|
||||
pycodestyle==2.14.0
|
||||
pycryptodome==3.23.0
|
||||
pydantic==2.11.7
|
||||
pydantic_core==2.33.2
|
||||
pyflakes==3.4.0
|
||||
python-dotenv==1.1.1
|
||||
radon==6.0.1
|
||||
redis==6.4.0
|
||||
requests==2.32.5
|
||||
six==1.17.0
|
||||
SQLAlchemy==2.0.43
|
||||
typing-inspection==0.4.1
|
||||
typing_extensions==4.14.1
|
||||
|
||||
Reference in New Issue
Block a user