Merge pull request #94 from alpacahq/fix/example_messages

Fix/example messages

Author: ttt733

alpaca_trade_api/common.py

@@ -14,23 +14,26 @@ def get_data_url():
 def get_credentials(key_id=None, secret_key=None):
     key_id = key_id or os.environ.get('APCA_API_KEY_ID')
     if key_id is None:
-        raise ValueError('Key ID must be given to access Alpaca trade API')
+        raise ValueError('Key ID must be given to access Alpaca trade API',
+                         ' (env: APCA_API_KEY_ID)')
 
     secret_key = secret_key or os.environ.get('APCA_API_SECRET_KEY')
     if secret_key is None:
-        raise ValueError('Secret key must be given to access Alpaca trade API')
+        raise ValueError('Secret key must be given to access Alpaca trade API'
+                         ' (env: APCA_API_SECRET_KEY')
 
     return key_id, secret_key
 
 
 def get_polygon_credentials(alpaca_key=None):
     try:
-        alpaca_key, _ = get_credentials(alpaca_key)
+        alpaca_key, _ = get_credentials(alpaca_key, 'ignored')
     except ValueError:
         pass
     key_id = os.environ.get('POLYGON_KEY_ID') or alpaca_key
     if key_id is None:
-        raise ValueError('Key ID must be given to access Polygon API')
+        raise ValueError('Key ID must be given to access Polygon API'
+                         ' (env: APCA_API_KEY_ID or POLYGON_KEY_ID)')
     return key_id
 
 

alpaca_trade_api/polygon/__init__.py

@@ -1,3 +1,3 @@
 from .rest import REST  # noqa
 from .stream import Stream  # noqa
-from .stream2 import StreamConn # noqa
+from .streamconn import StreamConn # noqa

alpaca_trade_api/polygon/stream2.py renamed to alpaca_trade_api/polygon/streamconn.py

@@ -11,6 +11,8 @@
 
 from datetime import datetime
 
+from alpaca_trade_api import StreamConn
+
 # For some fun colors...
 from colorama import Fore, Style, init as ColoramaInit
 
@@ -45,7 +47,7 @@ async def on_minute(conn, channel, bar):
     close = bar.close
 
     try:
-        percent = (bar.dailyopen - close)/close
+        percent = (close - bar.dailyopen)/close  * 100
         up = 1 if bar.open > bar.dailyopen else -1
     except:  # noqa
         percent = 0
@@ -66,7 +68,7 @@ async def on_minute(conn, channel, bar):
 
 async def on_tick(conn, channel, bar):
     try:
-        percent = (bar.dailyopen - bar.close)/bar.close
+        percent = (bar.close - bar.dailyopen)/bar.close * 100
     except:  # noqa
         percent = 0
 
@@ -111,18 +113,8 @@ async def watch_command():
         help="Prints debug messages",
         action='store_true')
 
-    parser.add_argument(
-        "--polygon",
-        help="Only import Polygon.StreamConn instead of Alpaca Wrapper (mainly for testing)",
-        action='store_true')
-
     opt = parser.parse_args()
 
-    if opt.polygon:
-        from alpaca_trade_api.polygon import StreamConn
-    else:
-        from alpaca_trade_api import StreamConn
-
     conn = StreamConn()
 
     # This is another way to setup wrappers for websocket callbacks, handy if conn is not global.

examples/simpleStream.py

@@ -1,5 +1,5 @@
 from alpaca_trade_api.stream2 import StreamConn
-from alpaca_trade_api.polygon.stream2 import StreamConn as PolyStream
+from alpaca_trade_api.polygon import StreamConn as PolyStream
 from alpaca_trade_api.entity import Account
 import asyncio
 import json