Merge branch 'release/0.6.2' into main

analogstudio · May 10, 2023 · 737e241 · 737e241
2 parents 0b7b3ad + 92e8fc0
commit 737e241
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/an_farmview/client/envmonitor.py b/an_farmview/client/envmonitor.py
@@ -2,10 +2,12 @@
 import requests
 import pprint
 
+from an_farmview.config import settings
+
 import an_farmview.snmp
 
 def post():
-    url = f'{os.getenv("AN_FARMVIEW_API_URL")}/envmonitor'
+    url = f'{settings.an_farmview_api_url}/envmonitor'
 
     data = {
         "temperature01": an_farmview.snmp.get_temperature_rear(),
@@ -16,7 +18,7 @@ def post():
     pprint.pprint(r.json())
 
 def get():
-    url_get = f'{os.getenv("AN_FARMVIEW_API_URL")}/envmonitors'
+    url_get = f'{settings.an_farmview_api_url}/envmonitors'
     getr = requests.get(url_get)
     pprint.pprint(getr.json())
 

diff --git a/an_farmview/client/ubl.py b/an_farmview/client/ubl.py
@@ -2,10 +2,12 @@
 import requests
 import pprint
 
+from an_farmview.config import settings
+
 import an_farmview.ubl
 
 def post():
-    url = f'{os.getenv("AN_FARMVIEW_API_URL")}/api/setubl'
+    url = f'{settings.an_farmview_api_url}/api/setubl'
 
     data = an_farmview.ubl.get_ubl_data()
     print(f'{__name__} - data to post: {data}')
@@ -14,7 +16,7 @@ def post():
     pprint.pprint(r.json())
 
 def get():
-    url_get = f'{os.getenv("AN_FARMVIEW_API_URL")}/api/getubl'
+    url_get = f'{settings.an_farmview_api_url}/api/getubl'
     getr = requests.get(url_get)
     pprint.pprint(getr.json())
 

diff --git a/an_farmview/config.py b/an_farmview/config.py
@@ -7,7 +7,8 @@ class Settings(BaseSettings):
     fno_password: str
     snmp_community: str = ''
     snmp_ip: str = ''
-
+    an_farmview_api_url: str = 'empty'
+
     class Config:
         env_file = ".env"
 

diff --git a/env_template.txt b/env_template.txt
@@ -1,2 +1,5 @@
 SNMP_COMMUNITY=
-SNMP_IP=
+SNMP_IP=
+FNO_SERVER=
+FNO_PASSWORD=
+AN_FARMVIEW_API_URL=