populate request transport headers

Author: HelloGrayson

tchannel/request.py

@@ -2,10 +2,61 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from . import schemes
+
+__all__ = ['Request']
+
 
 class Request(object):
+    """TChannel Request"""
+
+    # TODO move over other props from tchannel.tornado.request
+
+    __slots__ = (
+        'body',
+        'headers',
+        'transport'
+    )
 
     def __init__(self, body=None, headers=None, transport=None):
         self.body = body
         self.headers = headers
         self.transport = transport
+
+
+class TransportHeaders(object):
+    """Request Transport Headers"""
+
+    # TODO implement __repr__
+    # TODO retry_flags should be woke up past a string
+
+    __slots__ = (
+        'caller_name',
+        'claim_at_start',
+        'claim_at_finish',
+        'failure_domain',
+        'retry_flags',
+        'scheme',
+        'speculative_exe',
+    )
+
+    def __init__(self,
+                 caller_name=None,
+                 claim_at_start=None,
+                 claim_at_finish=None,
+                 failure_domain=None,
+                 retry_flags=None,
+                 scheme=None,
+                 speculative_exe=None,
+                 **kwargs):
+
+        if scheme is None:
+            scheme = schemes.RAW
+
+        self.caller_name = caller_name
+        self.claim_at_start = claim_at_start
+        self.claim_at_finish = claim_at_finish
+        self.failure_domain = failure_domain
+        self.retry_flags = retry_flags
+        self.scheme = scheme
+        self.speculative_exe = speculative_exe

tchannel/response.py

@@ -22,26 +22,60 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from . import transport
+from . import schemes
 
 __all__ = ['Response']
 
 
 class Response(object):
+    """TChannel Response"""
 
-    # TODO add __slots__
     # TODO implement __repr__
 
+    __slots__ = (
+        'body',
+        'headers',
+        'transport',
+    )
+
     def __init__(self, body=None, headers=None, transport=None):
         self.body = body
         self.headers = headers
         self.transport = transport
 
 
-class ResponseTransportHeaders(transport.TransportHeaders):
+class ResponseTransportHeaders(object):
+    """Response-specific Transport Headers"""
 
-    # TODO add __slots__
     # TODO implement __repr__
 
-    """Response-specific Transport Headers"""
-    pass
+    __slots__ = (
+        'failure_domain',
+        'scheme',
+    )
+
+    def __init__(self,
+                 failure_domain=None,
+                 scheme=None,
+                 **kwargs):
+
+        if scheme is None:
+            scheme = schemes.RAW
+
+        self.failure_domain = failure_domain
+        self.scheme = scheme
+
+
+def response_from_mixed(mixed):
+    """Create Response from mixed input."""
+
+    # if none then give empty Response
+    if mixed is None:
+        return Response()
+
+    # if not Response, then treat like body
+    if not isinstance(mixed, Response):
+        return Response(mixed)
+
+    # it's already a Response
+    return mixed

tchannel/thrift/server.py

@@ -25,7 +25,7 @@
 
 from tornado import gen
 
-from tchannel import Response
+from tchannel.response import Response, response_from_mixed
 from tchannel.tornado.request import TransportMetadata
 from tchannel.tornado.response import StatusCode
 
@@ -113,15 +113,7 @@ def handler(request):
         except Exception:
             result.write_exc_info(sys.exc_info())
         else:
-            # TODO dont duplicate in dispatcher
-            # if no return then use empty response
-            if response is None:
-                response = Response()
-
-            # if not a response, then it's just the body, create resp
-            if not isinstance(response, Response):
-                response = Response(response)
-
+            response = response_from_mixed(response)
             result.write_result(response.body)
 
         response.body = result.result

tchannel/tornado/dispatch.py

@@ -28,7 +28,9 @@
 import tornado.gen
 from tornado import gen
 
-from tchannel import Request, Response
+from tchannel import transport
+from tchannel.request import Request, TransportHeaders
+from tchannel.response import response_from_mixed
 from ..errors import InvalidEndpointError
 from ..errors import TChannelError
 from ..event import EventType
@@ -164,27 +166,28 @@ def handle_call(self, request, connection):
         connection.post_response(response)
 
         try:
-
             # New impl - the handler takes a request and returns a response
             if self._handler_returns_response:
 
                 # convert deprecated req to new top-level req
                 b = yield request.get_body()
                 he = yield request.get_header()
-                new_req = Request(b, he)
+                t = request.headers
+                t = transport.to_kwargs(t)
+                t = TransportHeaders(**t)
+                new_req = Request(
+                    body=b,
+                    headers=he,
+                    transport=t,
+                )
 
                 # get new top-level resp from controller
                 new_resp = yield gen.maybe_future(
                     handler.endpoint(new_req)
                 )
 
-                # if no return then use empty response
-                if new_resp is None:
-                    new_resp = Response()
-
-                # if not a response, then it's just the body, create resp
-                if not isinstance(new_resp, Response):
-                    new_resp = Response(new_resp)
+                # instantiate a tchannel.Response
+                new_resp = response_from_mixed(new_resp)
 
                 # assign resp values to dep response
                 response.write_header(new_resp.headers)

tchannel/tornado/request.py

@@ -44,7 +44,9 @@ class Request(object):
     This is going to hide the protocol level message information.
     """
 
+    # TODO deprecate in favor of top-level tchannel.Request
     # TODO decide which elements inside "message" object to expose to user.
+
     def __init__(
         self,
         id=None,

tchannel/tornado/tchannel.py

@@ -60,6 +60,8 @@
 class TChannel(object):
     """Manages inbound and outbound connections to various hosts."""
 
+    # TODO deprecate in favor of top-level tchannel.TChannel
+
     FALLBACK = RequestDispatcher.FALLBACK
 
     def __init__(self, name, hostport=None, process_name=None,

tchannel/transport.py

@@ -22,8 +22,6 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from . import schemes
-
 CALLER_NAME = "cn"
 CLAIM_AT_START = "cas"
 CLAIM_AT_FINISH = "caf"
@@ -47,15 +45,3 @@ def to_kwargs(data):
     args['speculative_exe'] = data.get(SPECULATIVE_EXE)
 
     return args
-
-
-class TransportHeaders(object):
-    """Transport Headers common between Request & Response"""
-
-    def __init__(self, scheme=None, failure_domain=None, **kwargs):
-
-        if scheme is None:
-            scheme = schemes.DEFAULT
-
-        self.scheme = scheme
-        self.failure_domain = failure_domain