Переглянути джерело

object key, bodystream 마지막 데이터 오류, site 오류 수정

heewon 3 роки тому
батько
коміт
1e46ab454f
1 змінених файлів з 15 додано та 100 видалено
  1. 15 100
      ambt-wallpad-whole-prep/ambt-wallpad-whole-prep.ipynb

+ 15 - 100
ambt-wallpad-whole-prep/ambt-wallpad-whole-prep.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 944,
+   "execution_count": 32,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -17,7 +17,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 945,
+   "execution_count": 33,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -30,7 +30,7 @@
     "    try :\n",
     "        if data['data']['function'] == 'metering' :\n",
     "            metering_json['timestamp'] = data['timestamp']\n",
-    "            metering_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\n",
+    "            metering_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
     "            metering_json['dong'] = data['dong']\n",
     "            metering_json['ho'] = data['ho']\n",
     "            metering_json['electric_instant'] = data['data']['value']['electric'][0]\n",
@@ -44,9 +44,10 @@
     "            metering_json['hotwater_instant'] = data['data']['value']['hotwater'][0]\n",
     "            metering_json['hotwater_cumulative'] = data['data']['value']['hotwater'][1]\n",
     "            metering_data += json.dumps(metering_json) + \"\\n\"\n",
+    "            \n",
     "        elif data['data']['function'] == 'current_temperture' :\n",
     "            temperture_json['timestamp'] = data['timestamp']\n",
-    "            temperture_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\n",
+    "            temperture_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
     "            temperture_json['dong'] = data['dong']\n",
     "            temperture_json['ho'] = data['ho']\n",
     "            temperture_json['room1'] = data['data']['value']['room1'] if data['data']['value'].get('room1') != None else None\n",
@@ -60,7 +61,7 @@
     "            temperature_data += json.dumps(temperture_json) + \"\\n\"\n",
     "        elif data['data']['function'] == 'energy_meter' :\n",
     "            energymeter_json['timestamp'] = data['timestamp']\n",
-    "            energymeter_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\n",
+    "            energymeter_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
     "            energymeter_json['dong'] = data['dong']\n",
     "            energymeter_json['ho'] = data['ho']\n",
     "            energymeter_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
@@ -71,7 +72,7 @@
     "    \n",
     "            for i in range(0, data['data']['value']['lightCount']) :\n",
     "                energymeter_light_json['timestamp'] = data['timestamp']\n",
-    "                energymeter_light_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\n",
+    "                energymeter_light_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
     "                energymeter_light_json['dong'] = data['dong']\n",
     "                energymeter_light_json['ho'] = data['ho']\n",
     "                energymeter_light_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
@@ -83,7 +84,7 @@
     "                \n",
     "            for i in range(0, data['data']['value']['outletCount']) :\n",
     "                energymeter_outlet_json['timestamp'] = data['timestamp']\n",
-    "                energymeter_outlet_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\n",
+    "                energymeter_outlet_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
     "                energymeter_outlet_json['dong'] = data['dong']\n",
     "                energymeter_outlet_json['ho'] = data['ho']\n",
     "                energymeter_outlet_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
@@ -105,92 +106,7 @@
    "metadata": {
     "scrolled": true
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n",
-      "Expecting value: line 1 column 1 (char 0)\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "s3=boto3.resource('s3')\n",
     "bucket = s3.Bucket('hdci-ambt-wallpad-raw')\n",
@@ -217,12 +133,11 @@
     "    minute = obj.key.split('-')[9]\n",
     "    second = obj.key.split('-')[10]\n",
     "\n",
-    "    object = s3.Object('hdci-ambt-wallpad-raw',s3_key)\n",
+    "    object = s3.Object('hdci-ambt-wallpad-raw', obj.key)\n",
     "    bodystream = object.get()['Body'].read().decode(\"utf-8\")\n",
     "    try :\n",
-    "        for obj in bodystream.split('\\n') :\n",
-    "            if obj != None :\n",
-    "                pre_proecssing(json.loads(obj))\n",
+    "        for i in range(0, len(bodystream.split('\\n'))-1):\n",
+    "            pre_proecssing(json.loads(bodystream.split('\\n')[i]))\n",
     "    except ValueError as e:\n",
     "        print (e)\n",
     "    \n",
@@ -252,9 +167,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "conda_python3",
    "language": "python",
-   "name": "python3"
+   "name": "conda_python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -266,7 +181,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.6.13"
   }
  },
  "nbformat": 4,