0.0.9

dotextensions/server/commands.py

@@ -10,7 +10,7 @@
 import requests
 from requests import PreparedRequest
 
-from dothttp import RequestCompiler, Config, DotHttpException, dothttp_model, CurlCompiler, HttpFileFormatter
+from dothttp import RequestCompiler, Config, DotHttpException, dothttp_model, CurlCompiler, HttpFileFormatter, HttpDef
 from dothttp.parse_models import Http, Allhttp, UrlWrap, BasicAuth, Payload, MultiPartFile, FilesWrap, Query, Header, \
     NameWrap, Line
 from . import Command, Result, BaseHandler
@@ -47,7 +47,6 @@ def run(self, command: Command) -> Result:
                 })
             else:
                 comp = RequestCompiler(config)
-                request = comp.get_request()
                 resp = comp.get_response()
                 response_data = {
                     "response": {
@@ -57,17 +56,10 @@ def run(self, command: Command) -> Result:
                         "status": resp.status_code, }
                 }
                 # will be used for response
-                request_data = {"request": {
-                    "url": request.url,
-                    "body": request.body,
-                    "headers": request.headers,
-                    "method": request.method,
-                }}
                 data = {}
                 data.update(response_data['response'])  # deprecated
-                # data.update(request_data)
                 data.update(response_data)
-                # data.update({"http": self.get_http_from_req(request)})
+                data.update({"http": self.get_http_from_req(comp.httpdef)})
                 result = Result(id=command.id,
                                 result=data)
         except DotHttpException as ex:
@@ -77,17 +69,39 @@ def run(self, command: Command) -> Result:
         return result
 
     @staticmethod
-    def get_http_from_req(request: PreparedRequest):
+    def get_http_from_req(request: HttpDef):
+        data = None
+        datajson = None
+        file = None
+        json_payload = None
+        fileswrap = None
+        type = None
+        if request.payload.filename:
+            file = request.payload.filename
+        elif isinstance(request.payload.data, str):
+            data = request.payload.data
+        elif isinstance(request.payload.data, dict):
+            datajson = None
+        elif request.payload.json:
+            json_payload = request.payload.json
+        elif request.payload.files:
+            fileswrap = FilesWrap([])
+            for filekey, multipartdata in request.payload.files:
+                fileswrap.files.append(
+                    MultiPartFile(name=filekey,
+                                  path=multipartdata[1].name if multipartdata[0] else multipartdata[1],
+                                  type=multipartdata[2] if len(multipartdata) > 2 else None)
+                )
+
+        payload = Payload(data=data, datajson=datajson, file=file, json=json_payload, fileswrap=fileswrap, type=type)
         return HttpFileFormatter.format(Allhttp(allhttps=[Http(
-            namewrap=None,
+            namewrap=NameWrap(request.name),
             urlwrap=UrlWrap(url=request.url, method=request.method),
             lines=[
                 Line(header=Header(key=key, value=value), query=None)
                 for key, value in
                 request.headers.items()],
-            payload=Payload(data=request.body, datajson=None,
-                            file=None, json=None, fileswrap=None,
-                            type=None),
+            payload=payload,
             output=None, basic_auth_wrap=None
         )]))
 

dotextensions/server/server.py

@@ -5,9 +5,6 @@
 from json import JSONDecodeError
 from typing import Dict
 
-from flask import Flask
-from flask import request
-
 from . import Command, BaseHandler
 from .commands import RunHttpFileHandler, FormatHttpFileHandler, GetNameReferencesHandler, ImportPostmanCollection
 
@@ -40,6 +37,7 @@ def get_command(self, **kwargs):
 
 class HttpServer(Base):
     def __init__(self, port=5000):
+        from flask import Flask
         app = Flask("dothttp-server")
         self.app = app
         self.port = port
@@ -52,6 +50,7 @@ def run_forever(self):
 
     def get_handler(self, handler):
         def flask_api_handler():
+            from flask import request
             try:
                 id = int(request.args['id'])
                 command = {'method': handler, 'params': json.loads(request.data), 'id': id}

dotextensions/server/symbols/__init__.py

@@ -0,0 +1,21 @@
+from typing import Optional
+
+from dothttp import RequestCompiler
+
+
+class allkey(dict):
+    def get(self, key: str) -> Optional:
+        ret_val = super().get(key)
+        if (ret_val):
+            return ret_val
+        return ''
+
+
+class FetchNames(RequestCompiler):
+
+    def load(self):
+        self.load_content()
+        props = self.get_declared_props()
+        for prop in props:
+            self.properties[prop] = '""'
+        super().load()