specmatic 2.2.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

specmatic/core/specmatic_stub.py

@@ -17,7 +17,8 @@ class SpecmaticStub(SpecmaticBase):
         super().__init__(host, port, project_root, specmatic_config_file_path, args)
         self.__stub_started_event = None
         self.__process = None
-        self.__stub_running_success_message = 'Stub server is running on '
+        self.__free_port_message = 'Free port found'
+        self.__stub_serving_message = 'serving endpoints from specs'
         self.__error_queue = Queue()
         self.__start()
 
@@ -38,9 +39,14 @@ class SpecmaticStub(SpecmaticBase):
             print(f"\n Shutting down specmatic stub server on {self.host}:{self.port}, please wait ...")
             self.__process.kill()
 
-    def set_expectations(self, file_paths: []):
+    def set_expectations(self, file_paths: list[str], port: int|None = None):
+        port = port or self.port
+        if port is None:
+            raise Exception("The port needs to be specified, as the stub started on a random port and extraction failed from logs")
+
         if file_paths is None:
             file_paths = []
+
         try:
             for file_path in file_paths:
                 with open(file_path, 'r') as file:
@@ -48,7 +54,7 @@ class SpecmaticStub(SpecmaticBase):
                     headers = {
                         "Content-Type": "application/json"
                     }
-                    response = requests.post(self.__get_expectations_api_url(), json=json_string, headers=headers)
+                    response = requests.post(self.__get_expectations_api_url(port), json=json_string, headers=headers)
                     if response.status_code != 200:
                         self.stop()
                         raise Exception(f"{response.content} received for expectation json file: {json_string}")
@@ -58,8 +64,8 @@ class SpecmaticStub(SpecmaticBase):
             print(f"Error: {e}")
             raise e
 
-    def __get_expectations_api_url(self):
-        return f'http://{self.host}:{self.port}/_specmatic/expectations'
+    def __get_expectations_api_url(self, port):
+        return f'http://{self.host}:{port}/_specmatic/expectations'
 
     def __start_specmatic_stub_in_subprocess(self):
         stub_command = self.__create_stub_process_command()
@@ -83,9 +89,12 @@ class SpecmaticStub(SpecmaticBase):
 
     def __read_process_output(self):
         def signal_event_if_stub_has_started(line):
-            if self.__stub_running_success_message in line:
+            if self.__free_port_message in line and self.port == 0:
+                self.port = line.split(self.__free_port_message + ":")[1].strip()
+
+            if self.__stub_serving_message in line:
                 if self.port == 0:
-                    self.port = line.split(self.host + ':')[1].split('.')[0]
+                    self.port = line.split(self.__stub_serving_message)[0].split(":")[-1].strip()
                 self.__stub_started_event.set()
 
         def read_and_print_output_line_by_line():

specmatic/version.py

@@ -1,2 +1,2 @@
-__version__ = '2.2.1'
-__specmatic_version__ = '2.2.1'
+__version__ = '2.4.0'
+__specmatic_version__ = '2.4.0'

{specmatic-2.2.1.dist-info → specmatic-2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: specmatic
-Version: 2.2.1
+Version: 2.4.0
 Summary: A Python module for using the Specmatic Library.
 Home-page: https://github.com/znsio/specmatic-python-extensions
 Author: Specmatic Builders

{specmatic-2.2.1.dist-info → specmatic-2.4.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 specmatic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/build_utils.py,sha256=vIOoNyEUYofdMo3-U5bB9obL0lvjw4dEEGbZJNIzsL0,564
 specmatic/utils.py,sha256=6JDPqpO51ykl0MWCOa32jkUOXZ-0RZ6N5Ng9_7r7XaU,519
-specmatic/version.py,sha256=nlbktQX5A9F3_g6teQ803O357Rl3W9NuXpSVK4EGkhY,54
+specmatic/version.py,sha256=kC06Pa1bxyfu0z0ZNpu3OCT9G8dd1XrL4vPRW3JJbbk,54
 specmatic/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/core/decorators.py,sha256=jGi_m2tGGn8HZOyiMvAB3GvOWW_AkuWZvfqztMVy2pc,3972
-specmatic/core/specmatic.jar,sha256=v0ENtzHWSIYs59FmY1JuqPNePaB9MTZNvVBBD1PliFM,74177990
+specmatic/core/specmatic.jar,sha256=EE7K_kTmikEbEYe3AlR1vcBjZZZbIIOsCnMQvApYiV8,74490852
 specmatic/core/specmatic.py,sha256=vi7-LM5XTKipWwemh5cnbIoAZDbg9fpFEISDs6YM_f4,7918
 specmatic/core/specmatic_base.py,sha256=IN9LY45EB5ApRtpF-LEkLmmy20gAXXAMwYhJQrS8TT0,1334
-specmatic/core/specmatic_stub.py,sha256=pDjUZXjOc2RvBDd_92QalH7zjVzoWuhAzMGqLnV3V0c,4526
+specmatic/core/specmatic_stub.py,sha256=XEzA9_MsLLgjvqA5MDN78BMUGAAbMi4RSgkzm4bxO-o,4964
 specmatic/core/specmatic_test.py,sha256=cXU5882L5wPUiscWwm1HDR_knBJjOCNssODcUrKBHdI,1048
 specmatic/coverage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/coverage/app_route_adapter.py,sha256=hFJ54R7CZFK9jFI6VbxHtKJKJgLX4PUX47TMdWjjhSA,1538
@@ -29,7 +29,7 @@ specmatic/servers/app_server.py,sha256=kOZviJA7-F4kmMTLGiBln2oO5uYX28wKJM2xQJTOV
 specmatic/servers/asgi_app_server.py,sha256=yn3tpWoF-nP8labOJdn49UB85vKiqIELVXk-gAugcUc,2924
 specmatic/servers/wsgi_app_server.py,sha256=3aU-o6Hh8FrnZlbjCLLpGY92HvJoU_rcqsZIb9TKVr8,1342
 specmatic/servers/wsgi_server_thread.py,sha256=XUEYW7-FP1a-5EkQVGc3FI_jkDQBocArxHLiCn3JJvc,691
-specmatic-2.2.1.dist-info/METADATA,sha256=0LjpvFwF47tsc5xqC43TD0tfUh7Z0ejb22cg5vniQhw,10356
-specmatic-2.2.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-specmatic-2.2.1.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
-specmatic-2.2.1.dist-info/RECORD,,
+specmatic-2.4.0.dist-info/METADATA,sha256=DCuF0NXokf6hLLr26NlrySzPETrHACN75jsOa4sHGss,10356
+specmatic-2.4.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+specmatic-2.4.0.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
+specmatic-2.4.0.dist-info/RECORD,,