From 289062da8d6b4c9bf78ab01343f6a59ebc09866f Mon Sep 17 00:00:00 2001 From: matze Date: Tue, 5 Nov 2024 16:31:01 +0100 Subject: [PATCH] fix token timeout --- neofarm/lib.py | 17 +++++------------ reporting.ipynb | 6 ------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/neofarm/lib.py b/neofarm/lib.py index 741a62a..b1e4b31 100644 --- a/neofarm/lib.py +++ b/neofarm/lib.py @@ -2,13 +2,6 @@ import requests from oauthlib.oauth2 import BackendApplicationClient from requests_oauthlib import OAuth2Session, OAuth2 import jsonapi_requests -import importlib -import neofarm.orm.my_meta -import neofarm.orm.log as Log -import neofarm.orm.asset as Asset -import neofarm.orm.quantity as Quantity -import neofarm.orm.taxonomy as Taxonomy -importlib.reload(neofarm.orm.my_meta) from . orm.my_meta import MyMeta # constants: @@ -38,8 +31,8 @@ def init_api(): api = init_api() MyMeta.set_api(api) -# these have to be defined after MyMeta.api is set for the correct value to be inherited -importlib.reload(neofarm.orm.log) -importlib.reload(neofarm.orm.asset) -importlib.reload(neofarm.orm.quantity) -importlib.reload(neofarm.orm.taxonomy) \ No newline at end of file +# orm stuff classes imported here to allow inheritance from MyMeta +import neofarm.orm.log as Log +import neofarm.orm.asset as Asset +import neofarm.orm.quantity as Quantity +import neofarm.orm.taxonomy as Taxonomy \ No newline at end of file diff --git a/reporting.ipynb b/reporting.ipynb index 51a5fe2..0d4b6b2 100644 --- a/reporting.ipynb +++ b/reporting.ipynb @@ -13,8 +13,6 @@ "outputs": [], "source": [ "import neofarm.lib as neo\n", - "import importlib\n", - "importlib.reload(neo)\n", "\n", "#plant = neo.Asset.Plant.from_id(\"76f89f82-1238-43bb-b34f-796a92d491a2\")\n", "#print(plant.name)\n", @@ -101,8 +99,6 @@ "outputs": [], "source": [ "import neofarm.lib as neo\n", - "import importlib\n", - "importlib.reload(neo)\n", "\n", "inputs = neo.Input.get_list()\n", "for element in inputs:\n", @@ -128,8 +124,6 @@ "outputs": [], "source": [ "import neofarm.lib as neo\n", - "import importlib\n", - "importlib.reload(neo)\n", "\n", "data = neo.Harvest.get_list()\n", "for element in data:\n",