reorganizes validator app

server.py

@@ -3,7 +3,7 @@ import utils
 import bittensor as bt
 from aiohttp import web
 from aiohttp.web_response import Response
-from validators import S1ValidatorWrapper, QueryValidatorParams
+from validators import S1ValidatorAPI, QueryValidatorParams, ValidatorAPI
 from middlewares import api_key_middleware, json_parsing_middleware
 
 """
@@ -34,9 +34,6 @@ EXPECTED_ACCESS_KEY="hey-michal" python app.py --neuron.model_id mock --wallet.n
 ```
 add --mock to test the echo stream
 """
-
-validator = None
-
 @api_key_middleware
 @json_parsing_middleware
 async def chat(request: web.Request) -> Response:
@@ -47,6 +44,10 @@ async def chat(request: web.Request) -> Response:
     params = QueryValidatorParams.from_dict(request_data)    
     # TODO: SET STREAM AS DEFAULT
     stream = request_data.get('stream', False)        
+    
+    # Access the validator from the application context
+    validator: ValidatorAPI = request.app['validator']
+    
     response = await validator.query_validator(params, stream=stream)
     return response
 
@@ -57,36 +58,39 @@ async def echo_stream(request, request_data):
     request_data = request['data']
     return await utils.echo_stream(request_data)
 
+
 class ValidatorApplication(web.Application):
-    def __init__(self, *a, **kw):
-        super().__init__(*a, **kw)
+    def __init__(self, validator_instance=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self['validator'] = validator_instance if validator_instance else S1ValidatorAPI()
+        
+        # Add middlewares to application
         self.middlewares.append(api_key_middleware)
         self.middlewares.append(json_parsing_middleware)
-
+        
+        self.add_routes([
+            web.post('/chat/', chat),
+            web.post('/echo/', echo_stream)
+        ])
         # TODO: Enable rewarding and other features
-
-
-validator_app = ValidatorApplication()
-validator_app.add_routes([
-    web.post('/chat/', chat),
-    web.post('/echo/', echo_stream)
-    ])
-
-bt.logging.info("Starting validator application.")
-bt.logging.info(validator_app)
-
-
+        
+        
 def main(run_aio_app=True, test=False) -> None:
     loop = asyncio.get_event_loop()
     port = 10000
     if run_aio_app:
+        # Instantiate the application with the actual validator
+        bt.logging.info("Starting validator application.")
+        validator_app = ValidatorApplication()        
+        bt.logging.success(f'Validator app initialized successfully', validator_app)
+        
         try:
             web.run_app(validator_app, port=port, loop=loop)
         except KeyboardInterrupt:
-            bt.logging.warning("Keyboard interrupt detected. Exiting validator.")
+            print("Keyboard interrupt detected. Exiting validator.")
         finally:
             pass
 
 if __name__ == "__main__":
-    validator = S1ValidatorWrapper()
     main()

validators/__init__.py

@@ -1,2 +1,2 @@
-from base import QueryValidatorParams, ValidatorWrapper, MockValidator
-from sn1_validator_wrapper import S1ValidatorWrapper
+from base import QueryValidatorParams, ValidatorAPI, MockValidator
+from sn1_validator_wrapper import S1ValidatorAPI

validators/base.py

@@ -23,13 +23,13 @@ class QueryValidatorParams:
             prefer=data.get('prefer', 'longest')
         )
 
-class ValidatorWrapper(ABC):
+class ValidatorAPI(ABC):
     @abstractmethod
     async def query_validator(self, params:QueryValidatorParams) -> Response:
         pass
     
     
-class MockValidator(ValidatorWrapper):    
+class MockValidator(ValidatorAPI):    
     async def query_validator(self, params:QueryValidatorParams) -> Response:
         ...
         

validators/sn1_validator_wrapper.py

@@ -8,11 +8,11 @@ from prompting.validator import Validator
 from prompting.utils.uids import get_random_uids
 from prompting.protocol import PromptingSynapse, StreamPromptingSynapse
 from prompting.dendrite import DendriteResponseEvent
-from base import QueryValidatorParams, ValidatorWrapper
+from base import QueryValidatorParams, ValidatorAPI
 from aiohttp.web_response import Response, StreamResponse
 from deprecated import deprecated
 
-class S1ValidatorWrapper(ValidatorWrapper):
+class S1ValidatorAPI(ValidatorAPI):
     def __init__(self):
         self.validator = Validator()