specmatic 0.8.2__py3-none-any.whl → 0.9.1__py3-none-any.whl

specmatic/core/specmatic.py

@@ -5,25 +5,38 @@ from specmatic.core.specmatic_test import SpecmaticTest
 from specmatic.generators.pytest_generator import PyTestGenerator
 from specmatic.generators.unittest_generator import UnitTestGenerator
 from specmatic.servers.app_server import AppServer
+from specmatic.servers.asgi_app_server import ASGIAppServer
+from specmatic.servers.wsgi_app_server import WSGIAppServer
 from specmatic.utils import get_junit_report_file_path
 
 
 class Specmatic:
     def __init__(self):
-        self.test_args = None
+        self.app = None
+        self.app_module = ''
+        self.app_host = '127.0.0.1'
+        self.app_port = 0
+        self.reset_app_config_func = None
+        self.set_app_config_func = None
+        self.app_server = None
+
+        self.stub_host = None
+        self.stub_port = None
+        self.expectations = None
         self.stub_args = None
+        self.stub = None
+
         self.test_class = None
-        self.test_port = None
         self.test_host = None
-        self.app_server = None
-        self.expectations = None
-        self.stub_port = None
-        self.stub_host = None
+        self.test_port = None
+        self.test_args = None
+
+        self.project_root = ''
+        self.specmatic_json_file_path = ''
+
         self.run_stub = False
         self.run_app = False
         self.run_tests = False
-        self.project_root = ''
-        self.specmatic_json_file_path = ''
 
     def with_project_root(self, project_root):
         self.project_root = project_root
@@ -33,7 +46,7 @@ class Specmatic:
         self.specmatic_json_file_path = specmatic_json_file_path
         return self
 
-    def stub(self, stub_host: str = '127.0.0.1', stub_port: int = 0, expectations=None, args=None):
+    def with_stub(self, stub_host: str = '127.0.0.1', stub_port: int = 0, expectations=None, args=None):
         self.stub_host = stub_host
         self.stub_port = stub_port
         self.run_stub = True
@@ -46,6 +59,26 @@ class Specmatic:
         self.run_app = True
         return self
 
+    def with_wsgi_app(self, app, host: str = '127.0.0.1', port: int = 0, set_app_config_func=None,
+                      reset_app_config_func=None):
+        self.app = app
+        self.app_host = host
+        self.app_port = port
+        self.set_app_config_func = set_app_config_func
+        self.reset_app_config_func = reset_app_config_func
+        self.run_app = True
+        return self
+
+    def with_asgi_app(self, app_module: str, host: str = '127.0.0.1', port: int = 0, set_app_config_func=None,
+                      reset_app_config_func=None):
+        self.app_module = app_module
+        self.app_host = host
+        self.app_port = port
+        self.set_app_config_func = set_app_config_func
+        self.reset_app_config_func = reset_app_config_func
+        self.run_app = True
+        return self
+
     def test(self, test_class, test_host: str = '127.0.0.1', test_port: int = 0, args=None):
         self.test_class = test_class
         self.test_host = test_host
@@ -54,26 +87,46 @@ class Specmatic:
         self.run_tests = True
         return self
 
-    def run(self):
-        stub = None
-        try:
-            if self.run_stub:
-                stub = SpecmaticStub(self.stub_host, self.stub_port, self.project_root, self.specmatic_json_file_path, self.stub_args)
-                stub.set_expectations(self.expectations)
-                self.app_server.set_app_config(stub.host, stub.port)
-            if self.run_app:
+    def __init_app_server(self):
+        if self.run_app:
+            if self.app is None and self.app_module == '':
+                raise Exception('Please specify either an app or an app_module.')
+            if self.app is not None and self.app_module != '':
+                raise Exception('Please specify only one of app or app_module, and not both.')
+            if self.app is not None:
+                self.app_server = WSGIAppServer(self.app, self.app_host, self.app_port, self.set_app_config_func,
+                                                self.reset_app_config_func)
+            else:
+                self.app_server = ASGIAppServer(self.app_module, self.app_host, self.app_port, self.set_app_config_func,
+                                                self.reset_app_config_func)
+
+    def __start_stub(self):
+        if self.run_stub:
+            self.stub = SpecmaticStub(self.stub_host, self.stub_port, self.project_root, self.specmatic_json_file_path,
+                                      self.stub_args)
+            self.stub.set_expectations(self.expectations)
+            self.app_server.set_app_config(self.stub.host, self.stub.port)
+
+    def __execute_tests(self):
+        if self.run_tests:
+            if self.app_server is not None:
                 self.app_server.start()
                 self.test_host = self.app_server.host
                 self.test_port = self.app_server.port
-            if self.run_tests:
-                SpecmaticTest(self.test_host, self.test_port, self.project_root,
-                              self.specmatic_json_file_path, self.test_args).run()
-                if issubclass(self.test_class,  unittest.TestCase):
-                    print("Injecting unittest methods")
-                    UnitTestGenerator(self.test_class, get_junit_report_file_path()).generate()
-                else:
-                    print("Injecting pytest methods")
-                    PyTestGenerator(self.test_class, get_junit_report_file_path()).generate()
+            SpecmaticTest(self.test_host, self.test_port, self.project_root,
+                          self.specmatic_json_file_path, self.test_args).run()
+            if issubclass(self.test_class, unittest.TestCase):
+                print("Injecting unittest methods")
+                UnitTestGenerator(self.test_class, get_junit_report_file_path()).generate()
+            else:
+                print("Injecting pytest methods")
+                PyTestGenerator(self.test_class, get_junit_report_file_path()).generate()
+
+    def run(self):
+        try:
+            self.__init_app_server()
+            self.__start_stub()
+            self.__execute_tests()
         except Exception as e:
             print(f"Error: {e}")
             raise e
@@ -81,5 +134,5 @@ class Specmatic:
             if self.app_server is not None:
                 self.app_server.stop()
                 self.app_server.reset_app_config()
-            if stub is not None:
-                stub.stop()
+            if self.stub is not None:
+                self.stub.stop()

specmatic/servers/asgi_app_server.py

@@ -43,6 +43,9 @@ class ASGIAppServer(AppServer):
     def __read_process_output(self):
         try:
             for line in iter(self.__process.stdout.readline, ''):
+                if self.__process.poll() is not None:
+                    line = line.decode()
+                    raise Exception('App process terminated due to an error ' + line)
                 if line:
                     line = line.decode().rstrip()
                     print(line)

specmatic/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.8.2'
+__version__ = '0.9.1'
 __specmatic_version__ = '0.68.0'

{specmatic-0.8.2.dist-info → specmatic-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: specmatic
-Version: 0.8.2
+Version: 0.9.1
 Summary: A Python module for using the Specmatic Library.
 Home-page: https://github.com/znsio/specmatic-python-extensions
 Author: Specmatic Builders
@@ -45,28 +45,24 @@ The open api specification can be present either locally or in a [Central Contra
 ## WSGI Apps
 
 #### To run contract tests with a stub for a wsgi app (like Flask):  
-- Create an instance of a ``````WSGIAppServer`````` by passing it your app object, host, port:  
-``````app_server = WSGIAppServer(app, app_host, app_port)``````
-- Note:
-  - The host and port are optional. If they are not specified, the app will be started on a random available port on 127.0.0.1.
-  - You would need a [specmatic.json](https://specmatic.in/documentation/specmatic_json.html) file to be present in the root directory of your project.
-- To run tests using a stub for your dependencies:
+
 ``````
 class TestContract:
     pass
     
     
-app_server = WSGIAppServer(app, app_host, app_port)
 Specmatic() \
     .with_project_root(PROJECT_ROOT) \
-    .stub(stub_host, stub_port, [expectation_json_file]) \
-    .app(app_server) \
+    .with_stub(stub_host, stub_port, [expectation_json_file]) \
+    .with_wsgi_app(app, app_host, app_port) \
     .test(TestContract) \
     .run()
 `````` 
 
 - In this, we are passing:
-  - an instance of the WSGIAppServer class. 
+  - an instance of your asgi app like flask 
+  - app_host and app_port. If they are not specified, the app will be started on a random available port on 127.0.0.1.
+  - You would need a [specmatic.json](https://specmatic.in/documentation/specmatic_json.html) file to be present in the root directory of your project.
   - an empty test class.
   - stub_host, stub_port, optional list of json files to set expectations on the stub.  
     The stub_host, stub_port will be used to run the specmatic stub server.   
@@ -83,11 +79,9 @@ Specmatic() \
 class TestContract:
     pass
     
-    
-app_server = WSGIAppServer(app, app_host, app_port)
 Specmatic() \
     .with_project_root(PROJECT_ROOT) \
-    .app(app_server) \
+    .with_wsgi_app(app, app_host, app_port) \
     .test(TestContract) \
     .run()
 ``````                        
@@ -95,20 +89,16 @@ Specmatic() \
 ## ASGI Apps
 
 #### To run contract tests with a stub for an asgi app (like sanic):
-- Create an instance of a ``````ASGIAppServer`````` by passing it a string in the 'module:app' format for your asgi app, host, port:  
-``````app_server = ASGIAppServer('main:app', app_host, app_port)``````  
- If host and port are not specified, the app will be started on a random available port on 127.0.0.1.
-- You can now use the ``````ASGIAppServer`````` object to run tests just like we do it for WSGI apps:
+- If you are using an asgi app like sanic, fastapi, use the ``````with_asgi_app`````` function and pass it a string in the 'module:app' format.
 ``````
 class TestContract:
     pass
     
     
-app_server = ASGIAppServer('main:app', app_host, app_port)
 Specmatic() \
     .with_project_root(PROJECT_ROOT) \
-    .stub(stub_host, stub_port, [expectation_json_file]) \
-    .app(app_server) \
+    .with_stub(stub_host, stub_port, [expectation_json_file]) \
+    .with_asgi_app('main:app', app_host, app_port) \
     .test(TestContract) \
     .run()
 ``````
@@ -120,18 +110,17 @@ class TestContract:
     pass
 
 
-app_server = WSGIAppServer(app, app_host, app_port)
 Specmatic() \
     .with_project_root(PROJECT_ROOT) \
-    .stub(stub_host, stub_port, [expectation_json_file], ['--strict']) \
-    .app(app_server) \
+    .with_stub(stub_host, stub_port, [expectation_json_file], ['--strict']) \
+    .with_wsgi_app(app, port=app_port) \
     .test(TestContract, args=['--testBaseURL=http://localhost:5000']) \
     .run()
 ``````
 
 ## Common Issues
 - **'Error loading ASGI app'** 
-   This error occurs due to incorrect module being specified in the app module parameter 'module:app' string.
+   This error occurs when an incorrect app module string is passed to the ``````with_asgi_app`````` function.  
  
    #### Solutions:
    - Try to identify the correct module in which your app variable is instantiated/imported.  

{specmatic-0.8.2.dist-info → specmatic-0.9.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 specmatic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/utils.py,sha256=6JDPqpO51ykl0MWCOa32jkUOXZ-0RZ6N5Ng9_7r7XaU,519
-specmatic/version.py,sha256=ChaMG-i3_0ofrsjpKetrtiqQMlu3bPKNyhRsLcx4C74,55
+specmatic/version.py,sha256=MpN_PFJMmvrp-2TOtwaw16FhamYEEkOXXdUWtIOP4YM,55
 specmatic/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/core/decorators.py,sha256=_TWZMbUyH4WFyYHzW0oBcuef-c6ktukJ9Av3iYrDkTY,2879
 specmatic/core/specmatic.jar,sha256=LIHTAPFuGtfZ6zvcrwfVJ7luLAuSvMvDoalInN3pqUQ,87155557
-specmatic/core/specmatic.py,sha256=yldAkTDXeBaKyh_PoVh8fJevB5B0UHbMBwp2XZbqLM8,3221
+specmatic/core/specmatic.py,sha256=avagtEtRnfxUFqwHR3q-vIB0YdypJTsWEmQVA6DPXQQ,5361
 specmatic/core/specmatic_base.py,sha256=sueXRmjXXLV8YC_3rsxGng2bPt2qWIsTWEO2A9MXMP0,1497
 specmatic/core/specmatic_stub.py,sha256=_I6jc8oI7me6Q64gtPchRRqA-c8GGO5YTCIpw1nrwEo,4563
 specmatic/core/specmatic_test.py,sha256=rZXCeTlH-3wkShJECL7VDN2hlkJgmuiKQYzVRwnLNok,994
@@ -14,10 +14,10 @@ specmatic/generators/test_generator_base.py,sha256=bCdJD9MOUX6FINPF2r06y9NQ5k10q
 specmatic/generators/unittest_generator.py,sha256=Vkm8BP-_rZ-tFbLwUTNc90OgQCMJ4OHd8w5mShhcFyU,713
 specmatic/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/servers/app_server.py,sha256=kOZviJA7-F4kmMTLGiBln2oO5uYX28wKJM2xQJTOVQY,456
-specmatic/servers/asgi_app_server.py,sha256=mQ885snLeUUtb0mrDjLiT9CS-6MGVdFsCYEz9dAL51A,2743
+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-0.8.2.dist-info/METADATA,sha256=QNuMVSTfdOp0By2vb8r447iMwx64CmIx2a4rXhUaSqw,6322
-specmatic-0.8.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-specmatic-0.8.2.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
-specmatic-0.8.2.dist-info/RECORD,,
+specmatic-0.9.1.dist-info/METADATA,sha256=OwazAuFZ4kT_CqWPPI914IixxOgtBreA9Ivspedn4d0,5717
+specmatic-0.9.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+specmatic-0.9.1.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
+specmatic-0.9.1.dist-info/RECORD,,