gridappsd-python 2024.8.1a1__tar.gz → 2025.2.1a1__tar.gz

{gridappsd_python-2024.8.1a1 → gridappsd_python-2025.2.1a1}/PKG-INFO

@@ -1,25 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: gridappsd-python
-Version: 2024.8.1a1
+Version: 2025.2.1a1
 Summary: A GridAPPS-D Python Adapter
-Home-page: https://gridappsd.readthedocs.io
 License: BSD-3-Clause
-Keywords: gridappsd,grid,activmq,powergrid,simulation,library
+Keywords: gridappsd,grid,activemq,powergrid,simulation,library
 Author: C. Allwardt
 Author-email: 3979063+craig8@users.noreply.github.com
-Requires-Python: >=3.7.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: dateutils (>=0.6.7,<0.7.0)
 Requires-Dist: pytz (>=2022.7,<2023.0)
 Requires-Dist: requests (==2.28.2)
 Requires-Dist: stomp-py (==6.0.0)
+Project-URL: Homepage, https://gridappsd.readthedocs.io
 Project-URL: Repository, https://github.com/GRIDAPPSD/gridappsd-python
 Description-Content-Type: text/markdown
 

gridappsd_python-2025.2.1a1/gridappsd/field_interface/__init__.py

@@ -0,0 +1,32 @@
+import logging
+import sys
+
+_log = logging.getLogger(__name__)
+
+try:
+    import warnings
+
+    import gridappsd_field_bus.field_interface.context as _context
+    import gridappsd_field_bus.field_interface.context_managers as _context_managers
+    import gridappsd_field_bus.field_interface as _field_interface
+    import gridappsd_field_bus.field_interface.agents as _agents
+    import gridappsd_field_bus.field_interface.field_proxy_forwarder as _field_proxy_forwarder
+    import gridappsd_field_bus.field_interface.gridappsd_field_bus as _gridappsd_field_bus
+    import gridappsd_field_bus.field_interface.interfaces as _interfaces
+
+    sys.modules['gridappsd.field_interface'] = _field_interface
+    sys.modules['gridappsd.field_interface.interfaces'] = _interfaces
+    sys.modules['gridappsd.field_interface.context_managers'] = _context_managers
+    sys.modules['gridappsd_.context_managers'] = _context_managers
+    sys.modules['gridappsd.field_interface.agents'] = _agents
+    sys.modules['gridappsd.field_interface.field_proxy_forwarder'] = _field_proxy_forwarder
+    sys.modules['gridappsd.field_interface.gridappsd_field_bus'] = _gridappsd_field_bus
+
+
+
+
+
+    warnings.warn(message="gridappsd.field_interface is deprecated and will be removed in a future release. Use gridappsd_field_bus.field_interface instead.",
+                  category=DeprecationWarning)
+except ImportError:
+    _log.error("Could not import field_interface install gridappsd-field-bus to get those functions.")

{gridappsd_python-2024.8.1a1 → gridappsd_python-2025.2.1a1}/gridappsd/goss.py

@@ -88,7 +88,8 @@ class GOSS(object):
                  attempt_connection=True,
                  override_threading=None,
                  stomp_log_level=logging.WARNING,
-                 goss_log_level=logging.INFO):
+                 goss_log_level=logging.INFO,
+                 use_auth_token=True):
 
         logging.getLogger('stomp.py').setLevel(stomp_log_level)
         logging.getLogger('goss').setLevel(goss_log_level)
@@ -97,6 +98,7 @@ class GOSS(object):
         self.__pass__ = password
         self.stomp_address = stomp_address
         self.stomp_port = stomp_port
+        self.use_auth_token = use_auth_token
 
         # Environmental variables should overrule the passed arguments.
         if os.environ.get(GRIDAPPSD_ENV_ENUM.GRIDAPPSD_USER.value):
@@ -289,7 +291,7 @@ class GOSS(object):
     def _make_connection(self):
         if self._conn is None or not self._conn.is_connected():
             _log.debug("Creating connection")
-            if not self.__token:
+            if self.use_auth_token is True and not self.__token:
 
                 # get token
                 # get initial connection
@@ -351,7 +353,10 @@ class GOSS(object):
             if self._override_thread_fc is not None:
                 self._conn.transport.override_threading(self._override_thread_fc)
             try:
-                self._conn.connect(self.__token, "", wait=True)
+                if self.use_auth_token and self.__token is not None:
+                    self._conn.connect(self.__token, "", wait=True)
+                else:
+                    self._conn.connect(self.__user__,self.__pass__, wait=True)
             except TypeError as e:
                 _log.error("TypeError: {e}".format(e=e))
             except NotConnectedException as e:

{gridappsd_python-2024.8.1a1 → gridappsd_python-2025.2.1a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gridappsd-python"
-version = "2024.8.1a1"
+version = "2025.2.1a1"
 description = "A GridAPPS-D Python Adapter"
 authors = [
     "C. Allwardt <3979063+craig8@users.noreply.github.com>",
@@ -12,7 +12,7 @@ license = "BSD-3-Clause"
 repository = "https://github.com/GRIDAPPSD/gridappsd-python"
 homepage = "https://gridappsd.readthedocs.io"
 
-keywords = ["gridappsd", "grid", "activmq", "powergrid", "simulation", "library"]
+keywords = ["gridappsd", "grid", "activemq", "powergrid", "simulation", "library"]
 
 readme = "README.md"
 
@@ -29,7 +29,7 @@ gridappsd-cli = 'gridappsd.cli:_main'
 
 
 [tool.poetry.dependencies]
-python = ">=3.7.9,<4.0"
+python = ">=3.10,<4.0"
 PyYAML = "^6.0"
 pytz = "^2022.7"
 dateutils = "^0.6.7"
@@ -37,13 +37,14 @@ stomp-py = "6.0.0"
 requests = "2.28.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^6.2.2"
+pytest = "^8.3.4"
 pytest-html = "^3.1.1"
 mock = "^4.0.3"
 yapf = "^0.32.0"
 mypy = "^1.3.0"
 python-on-whales = "^0.60.1"
 gitpython = "^3.1.31"
+pre-commit = "^4.1.0"
 
 [build-system]
 requires = ["poetry-core>=1.2.0"]
@@ -62,3 +63,7 @@ based_on_style = "pep8"
 spaces_before_comment = 4
 column_limit = 99
 split_before_logical_operator = true
+
+
+[tool.poetry.requires-plugins]
+poetry-plugin-export = ">=1.8"