better code; use non-default user-agent in example

Author: NikolayS

README.md

@@ -12,15 +12,14 @@ status_code | 302
 status_line | HTTP/1.1 302 Found
 headers     | {"P3P": "policyref=\"/w3c/p3p.xml\", CP=\"NON DSP ADM DEV PSD IVDo OUR IND STP PHY PRE NAV UNI\"", "Date": "Sat, 29 Oct 2016 00:08:43 GMT", "Server": "nginx", "Expires": "Sat, 29 Oct 2016 00:08:44 GMT", "Location": "https://ya.ru/", "Connection": "keep-alive", "Set-Cookie": "yandexuid=182183081477699724; Expires=Tue, 27-Oct-2026 00:08:43 GMT; Domain=.ya.ru; Path=/", "Cache-Control": "no-cache,no-store,max-age=0,must-revalidate", "Last-Modified": "Sat, 29 Oct 2016 00:08:44 GMT", "Content-Length": "0"}
 body        |
-body_jsonb  |
 is_json     | f
 ```
 
 Another example, showing work with REST API:
 ```sql
 test=> with results as (
-  select jsonb_array_elements(get.body_jsonb->'results') as r
-  from http_client.get('http://pokeapi.co/api/v2/pokemon/')
+  select jsonb_array_elements(get.body::jsonb->'results') as r
+  from http_client.get('http://pokeapi.co/api/v2/pokemon/', '{"user-agent":"test-robot"}'::jsonb)
 )
 select r->>'url' as url, r->>'name' as pokename
 from results

install.sql

@@ -3,6 +3,7 @@ create schema http_client;
 do $$
 begin
     execute 'alter database '||current_database()||' set http_client.connect_timeout = 2;';
+    execute 'alter database '||current_database()||' set http_client.default_headers = ''{}'';';
 end;
 $$ language plpgsql;
 
@@ -33,32 +34,32 @@ try:
         res['status_code'] = conn.getcode()
         res['url_received'] = conn.geturl()
         respHeaders = conn.info().dict
-        res['headers'] = json.dumps(respHeaders)
-        if 'content-type' in respHeaders and respHeaders['content-type'].find('application/json') >= 0:
-            res['is_json'] = True
-            #res['body_jsonb'] = json.loads(res['body']) # try/except
-        else:
-            res['is_json'] = False
         conn.close()
     except HTTPError as e:
         res['status_code'] = e.code
-        res['headers'] = json.dumps(e.headers.dict) # undocumented http://stackoverflow.com/a/6402083/4677351
+        respHeaders = e.headers.dict # undocumented http://stackoverflow.com/a/6402083/4677351
         res['body'] = e.read()
-
-
+    res['headers'] = json.dumps(respHeaders)
+    if 'content-type' in respHeaders and respHeaders['content-type'].find('application/json') >= 0:
+        res['is_json'] = True
+    else:
+        res['is_json'] = False
     return res
 except Exception as e:
     msg = "Error in http_clien._get(): exception {0} occured."
     res = msg.format(e.__class__.__name__)
     return res
 $$ language plpython2u volatile;
 
-create or replace function http_client._post(
+create or replace function http_client.get(query text, headers jsonb) returns http_client.response as $$
+    select http_client._get(
+        query,
+        current_setting('http_client.connect_timeout')::integer,
+        current_setting('http_client.default_headers')::jsonb || coalesce(headers, '{}'::jsonb)
+    );
+$$ language sql volatile;
 
 create or replace function http_client.get(query text) returns http_client.response as $$
-    select http_client._get(query, current_setting('http_client.connect_timeout')::integer, null::jsonb);
+    select http_client.get(query, '{}'::jsonb);
 $$ language sql volatile;
 
-
-
-

uninstall.sql

@@ -1,6 +1,7 @@
 do $$
 begin
     execute 'alter database '||current_database()||' reset http_client.connect_timeout;';
+    execute 'alter database '||current_database()||' reset http_client.default_headers;';
 end;
 $$ language plpgsql;