Skip to content

Commit 29c3811

Browse files
committed
Rename from OctoBot Pro to OctoBot Script
1 parent 126a243 commit 29c3811

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+168
-163
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: OctoBot-Pro - Docker
1+
name: OctoBot-Script - Docker
22
on:
33
push:
44
branches:
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set Environment Variables
3232
run: |
3333
OWNER="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]' | tr -d '-')"
34-
IMG=octobot-pro
34+
IMG=octobot-script
3535
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3636
echo "IMAGE=${OWNER}/${IMG}" >> $GITHUB_ENV
3737
echo "LATEST=latest" >> $GITHUB_ENV

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: OctoBot-Pro - CI
1+
name: OctoBot-Script - CI
22
on:
33
push:
44
branches:
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
uses: Drakkar-Software/.github/.github/workflows/python3_lint_workflow.yml@master
1313
with:
14-
project_main_package: octobot_pro
14+
project_main_package: octobot_script
1515

1616
tests:
1717
name: ${{ matrix.os }} - Python - ${{ matrix.type }} - tests

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
8+
## [0.0.13] - 2023-10-09
9+
### Updated
10+
- Renamed from OctoBot Pro to OctoBot Script
11+
712
## [0.0.12] - 2023-09-27
813
### Added
914
- Dockerfile

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:3.10-slim-buster AS base
22

3-
WORKDIR /pro
3+
WORKDIR /app
44

55
# requires git to install requirements with git+https
66
RUN apt-get update \

MANIFEST.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
recursive-include octobot_pro/config *.json *.ini
2-
recursive-include octobot_pro/resources *.js *.css *.html
1+
recursive-include octobot_script/config *.json *.ini
2+
recursive-include octobot_script/resources *.js *.css *.html
33

44
include README.md
55
include LICENSE

README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
# Octobot-Pro [0.0.12](https://github.com/Drakkar-Software/OctoBot-Pro/tree/master/CHANGELOG.md)
2-
[![PyPI](https://img.shields.io/pypi/v/octobot-pro.svg?logo=pypi)](https://pypi.python.org/pypi/octobot-pro/)
3-
[![Downloads](https://static.pepy.tech/badge/octobot-pro/month)](https://pepy.tech/project/octobot-pro)
4-
[![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot-pro.svg?logo=docker)](https://hub.docker.com/r/drakkarsoftware/octobot-pro)
5-
[![Github-Action-CI](https://github.com/Drakkar-Software/OctoBot-Pro/workflows/OctoBot-Pro-CI/badge.svg)](https://github.com/Drakkar-Software/OctoBot-Pro/actions)
1+
# OctoBot-Script [0.0.12](https://github.com/Drakkar-Software/OctoBot-Script/tree/master/CHANGELOG.md)
2+
[![PyPI](https://img.shields.io/pypi/v/OctoBot-Script.svg?logo=pypi)](https://pypi.python.org/pypi/OctoBot-Script/)
3+
[![Downloads](https://static.pepy.tech/badge/OctoBot-Script/month)](https://pepy.tech/project/OctoBot-Script)
4+
[![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/OctoBot-Script.svg?logo=docker)](https://hub.docker.com/r/drakkarsoftware/OctoBot-Script)
5+
[![Github-Action-CI](https://github.com/Drakkar-Software/OctoBot-Script/workflows/OctoBot-Script-CI/badge.svg)](https://github.com/Drakkar-Software/OctoBot-Script/actions)
66

7-
## Octobot-Pro Community
8-
[![Telegram Chat](https://img.shields.io/badge/telegram-chat-green.svg?logo=telegram&label=Telegram)](https://octobot.click/readme-telegram-octobot-pro)
9-
[![Discord](https://img.shields.io/discord/530629985661222912.svg?logo=discord&label=Discord)](https://octobot.click/gh-discord-octobot-pro)
10-
[![Twitter](https://img.shields.io/twitter/follow/DrakkarsOctobot.svg?label=twitter&style=social)](https://octobot.click/gh-twitter-octobot-pro)
7+
## OctoBot-Script Community
8+
[![Telegram Chat](https://img.shields.io/badge/telegram-chat-green.svg?logo=telegram&label=Telegram)](https://octobot.click/readme-telegram-OctoBot-Script)
9+
[![Discord](https://img.shields.io/discord/530629985661222912.svg?logo=discord&label=Discord)](https://octobot.click/gh-discord-OctoBot-Script)
10+
[![Twitter](https://img.shields.io/twitter/follow/DrakkarsOctobot.svg?label=twitter&style=social)](https://octobot.click/gh-twitter-OctoBot-Script)
1111

1212

13-
## OctoBot Pro is the backtesting framework using the OctoBot Ecosystem
13+
## OctoBot Script is the backtesting framework using the OctoBot Ecosystem
1414

15-
> OctoBot Pro is in early alpha version
15+
> OctoBot Script is in early alpha version
1616
1717
Documentation available at [https://pro.octobot.info/](https://octobot.click/Xzae1a6)
1818

1919

20-
## Install OctoBot Pro from pip
20+
## Install OctoBot Script from pip
2121

22-
> OctoBot pro requires **Python 3.10**
22+
> OctoBot Script requires **Python 3.10**
2323
2424
``` {.sourceCode .bash}
2525
python3 -m pip install OctoBot wheel
26-
python3 -m pip install octobot-pro
26+
python3 -m pip install octobot-script
2727
```
2828

2929
## Example of a backtesting script
@@ -32,7 +32,7 @@ python3 -m pip install octobot-pro
3232
``` python
3333
import asyncio
3434
import tulipy # Can be any TA library.
35-
import octobot_pro as op
35+
import octobot_script as op
3636

3737

3838
async def rsi_test():
@@ -80,14 +80,14 @@ async def rsi_test():
8080

8181

8282
# Call the execution of the script inside "asyncio.run" as
83-
# OctoBot-Pro runs using the python asyncio framework.
83+
# OctoBot-Script runs using the python asyncio framework.
8484
asyncio.run(rsi_test())
8585
```
8686

8787
### Generated report
88-
![report-p1](https://raw.githubusercontent.com/Drakkar-Software/OctoBot-Pro/assets/images/report_1.jpg)
88+
![report-p1](https://raw.githubusercontent.com/Drakkar-Software/OctoBot-Script/assets/images/report_1.jpg)
8989

9090
### Join the community
91-
We recently created a telegram channel dedicated to OctoBot Pro.
91+
We recently created a telegram channel dedicated to OctoBot Script.
9292

93-
[![Telegram News](https://img.shields.io/static/v1?label=Telegram%20chat&message=Join&logo=telegram&&color=007bff&style=for-the-badge)](https://octobot.click/readme-telegram-octobot-pro)
93+
[![Telegram News](https://img.shields.io/static/v1?label=Telegram%20chat&message=Join&logo=telegram&&color=007bff&style=for-the-badge)](https://octobot.click/readme-telegram-OctoBot-Pro)

ai-example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import argparse
99

1010
import octobot_commons.symbols as symbols
11-
import octobot_pro as op
11+
import octobot_script as op
1212

1313
async def basic_evaluation_function(ctx):
1414
closes = await op.Close(ctx, max_history=True)

docs/data/fetching_data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Fetching trading data
22

3-
In order to run a backtest, OctoBot-Pro requires historical
3+
In order to run a backtest, OctoBot-Script requires historical
44
trading data, which is at least candles history.
55

66
## Fetching new data
7-
When using OctoBot-Pro, historical data can be fetched using:
7+
When using OctoBot-Script, historical data can be fetched using:
88
`await op.get_data(symbol, time frame)`
99

1010
Where:

docs/strategies/basis.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# OctoBot-Pro strategies
1+
# OctoBot-Script strategies
22

3-
On OctoBot-Pro, a trading strategy is a python async function that will be called at new price data.
3+
On OctoBot-Script, a trading strategy is a python async function that will be called at new price data.
44
``` python
55
async def strategy(ctx):
66
# your strategy content
@@ -12,7 +12,7 @@ In most cases, a strategy will:
1212
3. Decide to take (or not take) action depending on its configuration
1313
4. Create / cancel or edit orders (see [Creating orders](../../docs/trading/orders.md))
1414

15-
As OctoBot-Pro strategies are meant for backtesting, it is possible to create a strategy in 2 ways:
15+
As OctoBot-Script strategies are meant for backtesting, it is possible to create a strategy in 2 ways:
1616
## Pre-computed strategies
1717
Pre-computed are only possible in backtesting: since the data is already known, when dealing with technical
1818
evaluator based strategies, it is possible to compute the values of the evaluators for the whole backtest at once.

example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import asyncio
22
import tulipy # Can be any TA library.
3-
import octobot_pro as op
3+
import octobot_script as op
44

55

66
async def rsi_test():
@@ -48,5 +48,5 @@ async def strategy(ctx):
4848

4949

5050
# Call the execution of the script inside "asyncio.run" as
51-
# OctoBot-Pro runs using the python asyncio framework.
51+
# OctoBot-Script runs using the python asyncio framework.
5252
asyncio.run(rsi_test())

octobot_pro/ai/__init__.py

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is part of OctoBot-Pro (https://github.com/Drakkar-Software/OctoBot-Pro)
1+
# This file is part of OctoBot-Script (https://github.com/Drakkar-Software/OctoBot-Script)
22
# Copyright (c) 2023 Drakkar-Software, All rights reserved.
33
#
44
# OctoBot is free software; you can redistribute it and/or
@@ -12,19 +12,19 @@
1212
# General Public License for more details.
1313
#
1414
# You should have received a copy of the GNU General Public
15-
# License along with OctoBot-Pro. If not, see <https://www.gnu.org/licenses/>.
15+
# License along with OctoBot-Script. If not, see <https://www.gnu.org/licenses/>.
1616

17-
PROJECT_NAME = "OctoBot-Pro"
17+
PROJECT_NAME = "OctoBot-Script"
1818
AUTHOR = "Drakkar-Software"
19-
VERSION = "0.0.12" # major.minor.revision
19+
VERSION = "0.0.13" # major.minor.revision
2020

2121

2222
def _use_module_local_tentacles():
2323
import sys
2424
import os
2525
import appdirs
2626
if os.getenv("USE_CUSTOM_TENTACLES", "").lower() == "true":
27-
# do not use octobot_pro/imports tentacles
27+
# do not use octobot_script/imports tentacles
2828
# WARNING: in this case, all the required tentacles imports still have to work
2929
# and therefore be bound to another tentacles folder
3030
return
@@ -34,15 +34,15 @@ def _use_module_local_tentacles():
3434
sys.path.insert(0, internal_import_path)
3535

3636

37-
# run this before any other code as only octobot_pro module-local tentacles should be used
37+
# run this before any other code as only octobot_script module-local tentacles should be used
3838
_use_module_local_tentacles()
3939

4040
try:
41-
# import tentacles from octobot_pro/imports directory after "_use_local_tentacles()" call
41+
# import tentacles from octobot_script/imports directory after "_use_local_tentacles()" call
4242
from tentacles.Meta.Keywords import *
4343
# populate tentacles config helpers
4444
import octobot_tentacles_manager.loaders as loaders
45-
import octobot_pro.internal.octobot_mocks as octobot_mocks
45+
import octobot_script.internal.octobot_mocks as octobot_mocks
4646
loaders.reload_tentacle_by_tentacle_class(
4747
tentacles_path=octobot_mocks.get_imported_tentacles_path()
4848
)
@@ -53,7 +53,7 @@ def _use_module_local_tentacles():
5353
# tentacles not available during first install
5454
pass
5555

56-
from octobot_pro.constants import *
57-
from octobot_pro.api import *
58-
from octobot_pro.model import *
59-
from octobot_pro.ai import *
56+
from octobot_script.constants import *
57+
from octobot_script.api import *
58+
from octobot_script.model import *
59+
from octobot_script.ai import *

octobot_script/ai/__init__.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
try:
2+
from octobot_script.ai.environments import *
3+
from octobot_script.ai.models import *
4+
from octobot_script.ai.agents import *
5+
6+
from gymnasium.envs.registration import register
7+
8+
register(
9+
id='TradingEnv',
10+
entry_point='octobot_script.ai.environments:TradingEnv',
11+
disable_env_checker = True
12+
)
13+
except ImportError:
14+
pass

octobot_pro/ai/agents.py renamed to octobot_script/ai/agents.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import random
33
import numpy as np
44

5-
from octobot_pro.ai.models import mlp
5+
from octobot_script.ai.models import mlp
66

77
class DQNAgent:
88
def __init__(self, action_size):

octobot_pro/ai/environments.py renamed to octobot_script/ai/environments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from gymnasium import spaces
44
import numpy as np
55

6-
import octobot_pro as op
6+
import octobot_script as op
77
import octobot_trading.errors as octobot_trading_errors
88
import octobot_trading.api as trading_api
99

File renamed without changes.

octobot_pro/api/__init__.py renamed to octobot_script/api/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is part of OctoBot-Pro (https://github.com/Drakkar-Software/OctoBot-Pro)
1+
# This file is part of OctoBot-Script (https://github.com/Drakkar-Software/OctoBot-Script)
22
# Copyright (c) 2023 Drakkar-Software, All rights reserved.
33
#
44
# OctoBot is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
1212
# General Public License for more details.
1313
#
1414
# You should have received a copy of the GNU General Public
15-
# License along with OctoBot-Pro. If not, see <https://www.gnu.org/licenses/>.
15+
# License along with OctoBot-Script. If not, see <https://www.gnu.org/licenses/>.
1616

1717

18-
from octobot_pro.api.data_fetching import *
19-
from octobot_pro.api.execution import *
20-
from octobot_pro.api.ploting import *
18+
from octobot_script.api.data_fetching import *
19+
from octobot_script.api.execution import *
20+
from octobot_script.api.ploting import *

octobot_pro/api/data_fetching.py renamed to octobot_script/api/data_fetching.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is part of OctoBot-Pro (https://github.com/Drakkar-Software/OctoBot-Pro)
1+
# This file is part of OctoBot-Script (https://github.com/Drakkar-Software/OctoBot-Script)
22
# Copyright (c) 2023 Drakkar-Software, All rights reserved.
33
#
44
# OctoBot is free software; you can redistribute it and/or
@@ -12,13 +12,13 @@
1212
# General Public License for more details.
1313
#
1414
# You should have received a copy of the GNU General Public
15-
# License along with OctoBot-Pro. If not, see <https://www.gnu.org/licenses/>.
15+
# License along with OctoBot-Script. If not, see <https://www.gnu.org/licenses/>.
1616

1717
import octobot_backtesting.api as backtesting_api
1818
import octobot_commons.symbols as commons_symbols
1919
import octobot_commons.enums as commons_enums
2020
import octobot_trading.enums as trading_enums
21-
import octobot_pro.internal.octobot_mocks as octobot_mocks
21+
import octobot_script.internal.octobot_mocks as octobot_mocks
2222

2323

2424
def _ensure_ms_timestamp(timestamp):

octobot_pro/api/execution.py renamed to octobot_script/api/execution.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is part of OctoBot-Pro (https://github.com/Drakkar-Software/OctoBot-Pro)
1+
# This file is part of OctoBot-Script (https://github.com/Drakkar-Software/OctoBot-Script)
22
# Copyright (c) 2023 Drakkar-Software, All rights reserved.
33
#
44
# OctoBot is free software; you can redistribute it and/or
@@ -12,10 +12,10 @@
1212
# General Public License for more details.
1313
#
1414
# You should have received a copy of the GNU General Public
15-
# License along with OctoBot-Pro. If not, see <https://www.gnu.org/licenses/>.
15+
# License along with OctoBot-Script. If not, see <https://www.gnu.org/licenses/>.
1616

17-
import octobot_pro.internal.logging_util as logging_util
18-
import octobot_pro.internal.runners as runners
17+
import octobot_script.internal.logging_util as logging_util
18+
import octobot_script.internal.runners as runners
1919

2020

2121
async def run(backtesting_data, update_func, strategy_config,

octobot_pro/api/ploting.py renamed to octobot_script/api/ploting.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pylint: disable=E1101
2-
# This file is part of OctoBot-Pro (https://github.com/Drakkar-Software/OctoBot-Pro)
2+
# This file is part of OctoBot-Script (https://github.com/Drakkar-Software/OctoBot-Script)
33
# Copyright (c) 2023 Drakkar-Software, All rights reserved.
44
#
55
# OctoBot is free software; you can redistribute it and/or
@@ -13,11 +13,11 @@
1313
# General Public License for more details.
1414
#
1515
# You should have received a copy of the GNU General Public
16-
# License along with OctoBot-Pro. If not, see <https://www.gnu.org/licenses/>.
16+
# License along with OctoBot-Script. If not, see <https://www.gnu.org/licenses/>.
1717

1818
async def plot_indicator(ctx, name, x, y, signals=None):
1919
# lazy import
20-
import octobot_pro as op
20+
import octobot_script as op
2121

2222
await op.plot(ctx, name, x=list(x), y=list(y))
2323
value_by_x = {

0 commit comments

Comments
 (0)