Quality of life improvements. (#40)

* When using no contract, use the first available and warn user. (Before, when no contract specified, the app crashed.)
* Why not use only one dockerfile ? I've added the mqtt output in the same dockerfile and moved to the root. In the long run, I think having only one docker will be easier for users.
* Added a way to use environment variables instead of cli. This is the way to go for docker/k8s as environment are the principal way to configure an app.

.gitignore

@@ -8,4 +8,4 @@ dist/
 htmlcov/
 .pytest_cache/
 .tox/
-.coverage*
+.coverage*

docker/cli/Dockerfile → Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /usr/src/app
 COPY requirements.txt ./
 RUN pip install -r requirements.txt --force-reinstall --no-cache-dir
 
-COPY docker/cli/entrypoint.sh .
+COPY ./entrypoint.sh .
 
 COPY . .
 

docker/cli/entrypoint.sh → entrypoint.sh

@@ -35,4 +35,14 @@ then
  PYHQ_CMD_CONTRACT="-c $PYHQ_CONTRACT"
 fi
 
-pyhydroquebec -u $PYHQ_USER -p $PYHQ_PASSWORD $PYHQ_CMD_OUTPUT $PYHQ_CMD_CONTRACT
+# Config
+if [ -z "$CONFIG" ]
+then
+ export CONFIG="/etc/pyhydroquebec/pyhydroquebec.yaml"
+fi
+
+if [ "$PYHQ_OUTPUT" = "MQTT"] 
+ mqtt_pyhydroquebec
+else
+ pyhydroquebec -u $PYHQ_USER -p $PYHQ_PASSWORD $PYHQ_CMD_OUTPUT $PYHQ_CMD_CONTRACT
+fi

pyhydroquebec/__main__.py

@@ -5,6 +5,7 @@
 from datetime import datetime, timedelta
 from pprint import pprint
 import sys
+import os
 
 from pyhydroquebec.client import HydroQuebecClient
 from pyhydroquebec.consts import REQUESTS_TIMEOUT, HQ_TIMEZONE
@@ -17,8 +18,11 @@ async def fetch_data(client, contract_id, fetch_hourly=False):
  """Fetch data for basic report."""
  await client.login()
  for customer in client.customers:
- if customer.contract_id != contract_id:
+ if customer.contract_id != contract_id and contract_id is not None:
  continue
+ if contract_id is None:
+ client.logger.warn("Contract id not specified, using first available.")
+
  await customer.fetch_current_period()
  await customer.fetch_annual_data()
  await customer.fetch_monthly_data()
@@ -100,23 +104,38 @@ def main():
  print(VERSION)
  return 0
 
- if not args.username or not args.password:
+ # Check input for Username, Password and Contract - CLI overwrite ENV variable
+
+ # Check Env
+ hydro_user = os.environ.get("PYHQ_USER")
+ hydro_pass = os.environ.get("PYHQ_PASSWORD")
+ hydro_contract = os.environ.get("PYHQ_CONTRACT")
+
+ # Check Cli
+ if args.username:
+ hydro_user = args.username
+ if args.password:
+ hydro_pass = args.password
+ if args.contract:
+ hydro_contract = args.contract
+
+ if not hydro_user or not hydro_pass:
  parser.print_usage()
  print("pyhydroquebec: error: the following arguments are required: "
  "-u/--username, -p/--password")
  return 3
 
- client = HydroQuebecClient(args.username, args.password,
+ client = HydroQuebecClient(hydro_user, hydro_pass,
  args.timeout, log_level=args.log_level)
  loop = asyncio.get_event_loop()
 
  # Get the async_func
  if args.list_contracts:
  async_func = list_contracts(client)
  elif args.dump_data:
- async_func = dump_data(client, args.contract)
+ async_func = dump_data(client, hydro_contract)
  elif args.detailled_energy is False:
- async_func = fetch_data(client, args.contract, args.hourly)
+ async_func = fetch_data(client, hydro_contract, args.hourly)
  else:
  start_date = datetime.strptime(args.start_date, '%Y-%m-%d')
  end_date = datetime.strptime(args.end_date, '%Y-%m-%d')