Skip to content

Commit

Permalink
Use class library for shared code
Browse files Browse the repository at this point in the history
  • Loading branch information
@KjellRanda
KjellRanda committed Oct 30, 2024
1 parent 708d8e4 commit 91c45a5
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 133 deletions.
75 changes: 12 additions & 63 deletions MyUplink/MyUplinkScheduler.py
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,24 @@
import json
import sys
import os
from datetime import datetime
import configparser
import logging
import logging.handlers
import requests
import holidays

VERSION = "0.0.002"
from MyUplinkApi import myuplinkapi

VERSION = "0.1.00"

script_name = os.path.basename(__file__).split('.')[0]
logger = logging.getLogger('__name__')
logger.setLevel(logging.DEBUG)
formatter = logging.Formatter('%(asctime)s ' + script_name + ' ver:' + str(VERSION) + ' %(levelname)s %(message)s')
handler = logging.handlers.RotatingFileHandler("MyUplinkScheduler.log", mode='a', maxBytes=8388608, backupCount=16)
handler = logging.handlers.RotatingFileHandler(script_name + ".log", mode='a', maxBytes=8388608, backupCount=16)
handler.setFormatter(formatter)
logger.addHandler(handler)
logger.info("Starting ...")

def authorize(BASEURL, USERNAME, PASSWORD):
headers = {
"Accept": "application/json",
"Content-Type": "application/x-www-form-urlencoded"
}
payload = {
"client_id": "My-Uplink-Web",
"grant_type": "password",
"username": USERNAME,
"password": PASSWORD
}
url = BASEURL + "/oauth/token"
response = requests.post(url, headers=headers, data=payload, timeout=60)
if response.status_code == 200:
tResponse = response.json()
lifetime = tResponse["expires_in"]
token = tResponse["access_token"]
logger.info(f"Got token with lifetime {lifetime}s")
return token, lifetime
logger.error(f"Failed to get a token: {response.status_code}")
sys.exit(1)


def getdevID(baseurl):
url = baseurl + "/v2/groups/me"
dheaders = {
"Accept": "application/json",
"Content-Type": "application/x-www-form-urlencoded",
"Authorization": "Bearer " + token
}
response = requests.get(url, headers=dheaders, timeout=60)
if response.status_code == 200:
sysList = response.json()
for item in sysList["groups"]:
if item["role"] == "admin":
devid = item["devices"][0]["id"]
name = item["name"]
logger.info(f"Found device {devid} with name {name}")
return devid
logger.error(f"Failed to get devices: {response.status_code}")
sys.exit(2)

def updateSchedule(BASEURL, devid, json_data):
url = BASEURL + "/v2/devices/" + devid + "/weekly-schedules"
dheaders = {
"Content-Type": "application/json",
"Authorization": "Bearer " + token
}
response = requests.put(url, headers=dheaders, data=json_data, timeout=60)
if response.status_code == 200 or response.status_code == 204:
logger.info(f"Schedule sucessfully updated: {response.status_code}")
return
logger.error(f"Failed to update schedule: {response.status_code}")
sys.exit(3)

def dailyPriceList(lines):
pricel = {}
id = 1
Expand Down Expand Up @@ -193,7 +138,6 @@ def getConfig(kind):
except KeyError:
return ""

BASEURL = "https://internalapi.myuplink.com"

weekdays = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
jstring = '[{"weeklyScheduleId": 0,"weekFormat": "mon,tue,wed,thu,fri,sat,sun","events": ['
Expand All @@ -204,9 +148,14 @@ def getConfig(kind):
priceFile = getConfig("PRICE")
nFile = getConfig("GRIDFEE")

token, tleft = authorize(BASEURL,USERNAME, PASSWORD)
upl = myuplinkapi()
upl.apiUserPasswd(USERNAME, PASSWORD)
upl.setIntAPI()
upl.setLogger(logger)

tleft = upl.authorize()

devid = getdevID(BASEURL)
devid = upl.getDevID()

f = open(priceFile)
logger.info(f"Reading powerprice from {priceFile}")
Expand Down Expand Up @@ -260,4 +209,4 @@ def getConfig(kind):
jstring = jstring[:-1]
jstring += ']}]'
json_data = json.dumps(json.loads(jstring))
updateSchedule(BASEURL, devid, json_data)
upl.updateSchedule(json_data)
82 changes: 12 additions & 70 deletions MyUplink/MyUplinkServer.py
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,24 @@
import json
import time
import sys
import os
import configparser
import random
import logging
import logging.handlers
import requests
import paho.mqtt.client as mqtt

VERSION = "0.0.002"
from MyUplinkApi import myuplinkapi

VERSION = "0.1.00"

script_name = os.path.basename(__file__).split('.')[0]
logger = logging.getLogger('__name__')
logger.setLevel(logging.DEBUG)
formatter = logging.Formatter('%(asctime)s ' + script_name + ' ver:' + str(VERSION) + ' %(levelname)s %(message)s')
handler = logging.handlers.RotatingFileHandler("MyUplinkServer.log", mode='a', maxBytes=8388608, backupCount=16)
handler = logging.handlers.RotatingFileHandler(script_name + ".log", mode='a', maxBytes=8388608, backupCount=16)
handler.setFormatter(formatter)
logger.addHandler(handler)
logger.info("Starting ...")

def authorize(BASEURL, USERNAME, PASSWORD):
authurl = BASEURL + "/oauth/token"
headers = {
"Accept": "application/json",
"Content-Type": "application/x-www-form-urlencoded"
}
payload = {
"client_id": "My-Uplink-Web",
"grant_type": "password",
"username": USERNAME,
"password": PASSWORD
}
response = requests.post(authurl, headers=headers, data=payload, timeout=60)
if response.status_code == 200:
tResponse = response.json()
lifetime = tResponse["expires_in"]
token = tResponse["access_token"]
logger.info(f"Got token with lifetime {lifetime}s")
return token, lifetime
logger.error(f"Failed to get a token: {response.status_code}")
sys.exit(1)

def getdevID(BASEURL, dheaders):
url = BASEURL + "/v2/systems/me"
response = requests.get(url, headers=dheaders, timeout=60)
if response.status_code == 200:
sysList = response.json()
ndev = sysList["numItems"]
for i in range(ndev):
sys = sysList["systems"][i]
dev = sys["devices"]
if sys["securityLevel"] == "admin":
devid = dev[0]["id"]
name = sys["name"]
logger.info(f"Found device with role admin {devid} with name {name}")
return devid, name
logger.error(f"Failed to get devices: {response.status_code}")
sys.exit(2)

def getdevData(BASEURL, dheaders, params):
mqttData = []
url = BASEURL + "/v2/devices/" + devid + "/points?parameters=" + params
response = requests.get(url, headers=dheaders, timeout=60)
if response.status_code == 200:
dlist = response.json()
for item in dlist:
if item["parameterId"] == '406':
unit = item["strVal"]
else:
unit = item["parameterUnit"]
mqttData.append([item["parameterId"], item["parameterName"], item["value"], unit])
logger.debug(f'{item["parameterId"]} {item["parameterName"]} {item["value"]} {unit}')
return mqttData
logger.error(f"Failed to get device data: {response.status_code}")
sys.exit(3)

def getConfig(kind):
home = os.path.expanduser("~")
inifile = home + "/.MyUplink.ini"
Expand Down Expand Up @@ -126,7 +69,6 @@ def capUnspace(s):
return ''.join( (c.upper() if i == 0 or s[i-1] == ' ' else c) for i, c in enumerate(s) ).replace(" ", "")


BASEURL = "https://api.myuplink.com"
SLEEPTIME = 300
TOPIC = getConfig("TOPIC")
DATAL = getConfig("DATA")
Expand All @@ -140,6 +82,10 @@ def capUnspace(s):
mqttHOST, mqttPORT = getConfig("MQTTINFO")
sleep = int(getConfig('SLEEP'))

upl = myuplinkapi()
upl.apiUserPasswd(USERNAME, PASSWORD)
upl.setLogger(logger)

client = mqtt.Client(f'python-mqtt-{random.randint(0, 1000)}')
client.on_connect = on_connect
client.on_disconnect = on_disconnect
Expand All @@ -149,17 +95,13 @@ def capUnspace(s):

while True:
if tleft < 2*SLEEPTIME:
token, tleft = authorize(BASEURL, USERNAME, PASSWORD)
dheaders = {
"Accept": "application/json",
"Content-Type": "application/x-www-form-urlencoded",
"Authorization": "Bearer " + token
}
tleft = upl.authorize()

if devid == "":
devid, name = getdevID(BASEURL, dheaders)
devid = upl.getDevID()
name = upl.getDevName()

mqttData = getdevData(BASEURL, dheaders, DATAL)
mqttData = upl.getdevData(DATAL)

updateMQTT(client, TOPIC, name, mqttData)

Expand Down

0 comments on commit 91c45a5

Please sign in to comment.