besapi 4.0.2__tar.gz → 4.1.2__tar.gz

{besapi-4.0.2/src/besapi.egg-info → besapi-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: besapi
-Version: 4.0.2
+Version: 4.1.2
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-4.0.2 → besapi-4.1.2}/src/besapi/besapi.py

@@ -29,7 +29,7 @@ import lxml.objectify
 import requests
 import urllib3.poolmanager
 
-__version__ = "4.0.2"
+__version__ = "4.1.2"
 
 besapi_logger = logging.getLogger("besapi")
 
@@ -357,14 +357,17 @@ def get_bes_conn_interactive(
     try:
         return BESConnection(user, password, root_server)
     except requests.exceptions.HTTPError as err:
-        print("Bad Password, Try again!")
+        print("Bad Username or Bad Password, Try again!")
         logging.debug(err)
+        print("    BES_ROOT_SERVER: ", root_server)
         return get_bes_conn_interactive(
-            user=user, password=None, root_server=root_server, force_prompt=force_prompt
+            user=None, password=None, root_server=root_server, force_prompt=force_prompt
         )
     except requests.exceptions.ConnectionError as err:
         print("Bad Root Server Specified, Try again!")
         logging.debug("Connection Error: %s", err)
+        print("      BES_USER_NAME: ", user)
+        print("BES_PASSWORD length: ", len(password))
         return get_bes_conn_interactive(
             user=user, password=password, root_server=None, force_prompt=force_prompt
         )
@@ -612,7 +615,7 @@ class BESConnection:
         return RESTResult(
             self.session.post(
                 self.url("query"),
-                data=f"relevance={urllib.parse.quote(relevance, safe=':+')}",
+                data=f"relevance={urllib.parse.quote(relevance, safe=':')}",
                 verify=self.verify,
                 **kwargs,
             )

{besapi-4.0.2 → besapi-4.1.2/src/besapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: besapi
-Version: 4.0.2
+Version: 4.1.2
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-4.0.2 → besapi-4.1.2}/tests/test_besapi.py

@@ -312,6 +312,58 @@ def test_bes_conn_json():
         assert result is not None
         assert "TestString" in result
         assert "BES Support" in result
+        print("testing session relevance with + in relevance")
+        str_relevance_plus = 'lengths of first matches (regex " +") of "        "'
+        result = bes_conn.session_relevance_xml(str_relevance_plus)
+        print(result)
+        assert result is not None
+    else:
+        pytest.skip("Skipping BESConnection test, no config file or login failed.")
+
+
+def test_bes_conn_session_relevance_with_plus():
+    """Test the BESConnection class with JSON output."""
+
+    bes_conn = besapi.plugin_utilities.get_besapi_connection(None)
+
+    if bes_conn and bes_conn.login():
+        print("testing session relevance with + in relevance")
+        str_relevance_plus = 'lengths of first matches (regex " +") of "        "'
+        str_relevance_answer = "8"
+        result = bes_conn.session_relevance_xml(str_relevance_plus)
+        print(result)
+        assert result is not None
+        print(result.request.request.body)
+        assert f'<Answer type="integer">{str_relevance_answer}</Answer>' in str(result)
+        result = bes_conn.session_relevance_json_string(str_relevance_plus)
+        print(result)
+        assert result is not None
+        assert str_relevance_answer in str(result)
+        result = bes_conn.session_relevance_json(str_relevance_plus)
+        print(result)
+        assert result is not None
+        assert f"[{str_relevance_answer}]" in str(result["result"])
+        result = bes_conn.session_relevance_string(str_relevance_plus)
+        print(result)
+        assert result is not None
+        assert str_relevance_answer in str(result)
+        result = bes_conn.session_relevance_array(str_relevance_plus)
+        print(result)
+        assert result is not None
+        assert f"['{str_relevance_answer}']" in str(result)
+        result = bes_conn.session_relevance_json_array(str_relevance_plus)
+        print(result)
+        assert result is not None
+        assert f"[{str_relevance_answer}]" in str(result)
+
+        # test already escaped +
+        str_relevance_plus = r'lengths of first matches (regex " %2b") of "        "'
+        print(str_relevance_plus)
+        result = bes_conn.session_relevance_xml(str_relevance_plus)
+        print(result)
+        assert result is not None
+        print(result.request.request.body)
+        assert f'<Answer type="integer">{str_relevance_answer}</Answer>' in str(result)
     else:
         pytest.skip("Skipping BESConnection test, no config file or login failed.")