Skip to content

Commit 277db1f

Browse files
author
rob
committed
refactoring objects
1 parent b05a664 commit 277db1f

File tree

216 files changed

+266
-332
lines changed

Some content is hidden

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

216 files changed

+266
-332
lines changed

examples/production/example_of_custom_run_system.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from syscore.objects import arg_not_supplied
1+
from syscore.constants import arg_not_supplied
22

33
from sysdata.data_blob import dataBlob
44

sysbrokers/IB/client/ib_accounting_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
STALE_SECONDS_ALLOWED_ACCOUNT_SUMMARY,
66
)
77

8-
from syscore.objects import arg_not_supplied
8+
from syscore.constants import arg_not_supplied
99

1010
from sysobjects.spot_fx_prices import currencyValue, listOfCurrencyValues
1111

sysbrokers/IB/client/ib_client_id.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from syscore.objects import arg_not_supplied
1+
from syscore.constants import arg_not_supplied
22

33
from syslogdiag.log_to_screen import logtoscreen
44

sysbrokers/IB/client/ib_fx_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from sysbrokers.IB.ib_translate_broker_order_objects import tradeWithContract
1111
from syscore.exceptions import missingContract, missingData
1212

13-
from syscore.objects import arg_not_supplied
13+
from syscore.constants import arg_not_supplied
1414
from syscore.dateutils import Frequency, DAILY_PRICE_FREQ
1515

1616

sysbrokers/IB/client/ib_orders_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
)
77

88
from syscore.exceptions import missingContract
9-
from syscore.objects import arg_not_supplied
9+
from syscore.constants import arg_not_supplied
1010
from sysexecution.orders.named_order_objects import missing_order
1111
from sysbrokers.IB.client.ib_contracts_client import ibContractsClient
1212
from sysbrokers.IB.ib_translate_broker_order_objects import (

sysbrokers/IB/client/ib_positions_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from syscore.objects import arg_not_supplied
1+
from syscore.constants import arg_not_supplied
22
from sysbrokers.IB.client.ib_client import ibClient
33
from sysbrokers.IB.ib_positions import from_ib_positions_to_dict, positionsFromIB
44

sysbrokers/IB/ib_Fx_prices_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sysobjects.spot_fx_prices import fxPrices
99
from syslogdiag.log_to_screen import logtoscreen
1010
from syscore.fileutils import resolve_path_and_filename_for_package
11-
from syscore.objects import missing_instrument, missing_file
11+
from syscore.constants import missing_instrument, missing_file
1212

1313
IB_CCY_CONFIG_FILE = resolve_path_and_filename_for_package(
1414
"sysbrokers.IB.ib_config_spot_FX.csv"

sysbrokers/IB/ib_capital_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from sysbrokers.IB.client.ib_accounting_client import ibAccountingClient
33
from sysbrokers.broker_capital_data import brokerCapitalData
44

5-
from syscore.objects import arg_not_supplied
5+
from syscore.constants import arg_not_supplied
66

77
from sysobjects.spot_fx_prices import listOfCurrencyValues
88

sysbrokers/IB/ib_connection.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from sysbrokers.IB.ib_connection_defaults import ib_defaults
1111
from syscore.exceptions import missingData
12-
from syscore.objects import arg_not_supplied
12+
from syscore.constants import arg_not_supplied
1313

1414
from syslogdiag.log_to_screen import logtoscreen
1515

sysbrokers/IB/ib_connection_defaults.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sysdata.config.production_config import get_production_config
2-
from syscore.objects import arg_not_supplied
2+
from syscore.constants import arg_not_supplied
33

44
LIST_OF_IB_PARAMS = ["ib_ipaddress", "ib_port", "ib_idoffset"]
55

sysbrokers/IB/ib_contract_position_data.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
from sysbrokers.IB.ib_connection import connectionIB
88
from sysbrokers.broker_contract_position_data import brokerContractPositionData
99

10-
from syscore.objects import arg_not_supplied
11-
10+
from syscore.constants import arg_not_supplied
1211

1312
from sysobjects.production.positions import contractPosition, listOfContractPositions
1413
from sysobjects.contracts import futuresContract

sysbrokers/IB/ib_futures_contracts_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from sysbrokers.IB.ib_connection import connectionIB
77
from sysbrokers.broker_futures_contract_data import brokerFuturesContractData
88

9-
from syscore.objects import missing_instrument
9+
from syscore.constants import missing_instrument
1010
from syscore.exceptions import missingContract, missingData
1111

1212
from sysobjects.contract_dates_and_expiries import expiryDate, listOfContractDateStr

sysbrokers/IB/ib_fx_handling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from syscore.objects import arg_not_supplied
1+
from syscore.constants import arg_not_supplied
22
from syslogdiag.log_to_screen import logtoscreen
33

44
from sysbrokers.IB.client.ib_fx_client import ibFxClient

sysbrokers/IB/ib_instruments_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from syscore.fileutils import resolve_path_and_filename_for_package
1212
from syscore.genutils import return_another_value_if_nan
13-
from syscore.objects import missing_instrument, missing_file
13+
from syscore.constants import missing_instrument, missing_file
1414

1515
from sysobjects.instruments import futuresInstrument
1616

sysbrokers/IB/ib_orders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from sysbrokers.IB.client.ib_orders_client import ibOrdersClient
1919
from sysbrokers.broker_execution_stack import brokerExecutionStackData
2020

21-
from syscore.objects import failure, success, arg_not_supplied
21+
from syscore.constants import arg_not_supplied, success, failure
2222
from syscore.exceptions import orderCannotBeModified
2323
from sysexecution.orders.named_order_objects import missing_order
2424

sysbrokers/IB/ib_positions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22
from syscore.genutils import highest_common_factor_for_list, sign
3-
from syscore.objects import arg_not_supplied
3+
from syscore.constants import arg_not_supplied
44

55
from sysexecution.trade_qty import tradeQuantity
66

sysbrokers/IB/ib_translate_broker_order_objects.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sysbrokers.IB.ib_contracts import ibcontractWithLegs
99
from sysbrokers.broker_trade import brokerTrade
1010
from syscore.exceptions import missingData
11-
from syscore.objects import arg_not_supplied
11+
from syscore.constants import arg_not_supplied
1212
from sysexecution.orders.named_order_objects import missing_order
1313
from sysexecution.orders.base_orders import resolve_multi_leg_price_to_single_price
1414

sysbrokers/broker_capital_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from sysobjects.spot_fx_prices import listOfCurrencyValues
22

3-
from syscore.objects import arg_not_supplied
3+
from syscore.constants import arg_not_supplied
44

55
from sysdata.production.new_capital import capitalData
66
from syslogdiag.logger import logger

sysbrokers/broker_contract_position_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from syslogdiag.log_to_screen import logtoscreen
22

3-
from syscore.objects import arg_not_supplied
3+
from syscore.constants import arg_not_supplied
44

55
from sysdata.production.historic_positions import contractPositionData
66

sysbrokers/broker_execution_stack.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### An inheritance of a general order stack that includes methods for actually talking to the broker
2-
from syscore.objects import arg_not_supplied
2+
from syscore.constants import arg_not_supplied
33

44
from sysexecution.order_stacks.broker_order_stack import brokerOrderStackData
55
from sysexecution.order_stacks.broker_order_stack import orderWithControls

sysbrokers/broker_futures_contract_data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from sysobjects.production.trading_hours.trading_hours import listOfTradingHours
22
from syscore.exceptions import missingContract
3-
from syscore.objects import market_closed
3+
from syscore.constants import market_closed
44
from sysdata.futures.contracts import futuresContractData
55

66
from sysobjects.contract_dates_and_expiries import expiryDate

sysbrokers/broker_fx_handling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from syscore.objects import arg_not_supplied
1+
from syscore.constants import arg_not_supplied
22
from sysdata.base_data import baseData
33
from sysbrokers.broker_trade import brokerTrade
44

syscontrol/report_process_status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import datetime
22

3-
from syscore.objects import arg_not_supplied
3+
from syscore.constants import arg_not_supplied
44
from syslogdiag.logger import logger
55
from syslogdiag.log_to_screen import logtoscreen
66

syscontrol/run_process.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import time
2020
import sys
2121
from syscontrol.report_process_status import reportProcessStatus
22-
from syscore.objects import success, failure, status
22+
from syscore.constants import status, success, failure
2323

2424
from syscontrol.timer_functions import get_list_of_timer_functions, listOfTimerFunctions
2525

syscore/cache.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Here's a more general one
77
"""
88
from syscore.exceptions import missingData
9-
from syscore.objects import missing_data
9+
from syscore.constants import missing_data
1010

1111

1212
class Cache(object):

syscore/constants.py

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
none_type = type(None)
2+
3+
4+
class named_object:
5+
def __init__(self, name):
6+
self._name = str(name)
7+
8+
def __repr__(self):
9+
return self._name
10+
11+
12+
missing_instrument = named_object("missing instrument")
13+
missing_file = named_object("missing file")
14+
missing_data = named_object("missing data")
15+
market_closed = named_object("market closed")
16+
fill_exceeds_trade = named_object("fill too big for trade")
17+
arg_not_supplied = named_object("arg not supplied")
18+
user_exit = named_object("exit")
19+
20+
21+
class status(named_object):
22+
pass
23+
24+
25+
success = status("success")
26+
failure = status("failure")

syscore/dateutils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import numpy as np
1414

1515
from syscore.exceptions import missingData
16-
from syscore.objects import missing_data, arg_not_supplied
16+
from syscore.constants import missing_data, arg_not_supplied
1717

1818
"""
1919

syscore/interactive/interactive_date_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
calculate_start_and_end_dates,
77
get_date_from_period_and_end_date,
88
)
9-
from syscore.objects import arg_not_supplied
9+
from syscore.constants import arg_not_supplied
1010

1111

1212
def get_report_dates() -> Tuple[datetime.datetime, datetime.datetime]:

syscore/interactive/interactive_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from typing import Union
77

88
from syscore.genutils import str2Bool
9-
from syscore.objects import none_type
9+
from syscore.constants import none_type
1010

1111

1212
def true_if_answer_is_yes(

0 commit comments

Comments
 (0)