Removed tempfile

Author: tk-king

src/edgeml/Dataset.py edgeml/Dataset.pysrc/edgeml/Dataset.py renamed to edgeml/Dataset.py

@@ -1,8 +1,5 @@
-import tempfile
-import h5py
-import numpy as np
 from edgeml.TimeSeries import TimeSeries
-from edgeml.Labeling import Labeling, Label
+from edgeml.Labeling import Labeling
 from functools import reduce
 import pandas as pd 
 

src/edgeml/Labeling.py edgeml/Labeling.pysrc/edgeml/Labeling.py renamed to edgeml/Labeling.py

@@ -1,4 +1,4 @@
-import tempfile
+import io
 import h5py
 import numpy as np
 from edgeml.consts import getProjectEndpoint
@@ -48,13 +48,11 @@ def data(self, value):
 
     def loadData(self) -> pd.DataFrame:
         res = req.get(self._backendURL + getProjectEndpoint + self._readKey + "/" + self._datasetId + "/" + self._id)
-        with tempfile.NamedTemporaryFile(suffix=".h5", delete=False) as temp_file:
-            temp_file.write(res.content)
-            temp_file.flush()
+        with io.BytesIO(res.content) as temp_file:
             if self.length == 0 or self.length == None:
                 self.data = pd.DataFrame(columns=['time', self.name])
             else:
-                with h5py.File(temp_file.name, "r") as hf:
+                with h5py.File(temp_file, "r") as hf:
                     time_array = np.array(hf["time"])
                     data_array = np.array(hf["data"])
                     df = pd.DataFrame({"time": time_array, self.name: data_array})

src/edgeml/TimeSeries.py edgeml/TimeSeries.pysrc/edgeml/TimeSeries.py renamed to edgeml/TimeSeries.py

@@ -0,0 +1,2 @@
+from .edgeml import DatasetCollector, DatasetReceiver
+from . import edgeml

edgeml/__init__.py

@@ -1,6 +1,6 @@
 import requests as req
-from edgeml.consts import getProjectEndpoint, initDatasetIncrement, addDatasetIncrement
-from edgeml.Dataset import Dataset
+from .consts import getProjectEndpoint, initDatasetIncrement, addDatasetIncrement
+from .Dataset import Dataset
 import time
 
 class DatasetReceiver:
@@ -82,7 +82,7 @@ def __init__(
         )
 
         if res.status_code != 200:
-            raise RuntimeError(res.text.split(':')[1][1:-2])
+            raise RuntimeError(res.text)
 
         res_data = res.json()
         if not res_data or not res_data["id"]:
@@ -101,8 +101,8 @@ async def _addDataPoint_OwnTimeStamps(self, timestamp, name, value):
         if not isinstance(value, (int, float)):
             raise ValueError("Datapoint is not a number")
 
-        if not isinstance(timestamp, (int)):
-            raise ValueError("Provide a valid timestamp")
+        if not isinstance(timestamp, int):
+            raise ValueError(f"Timestamp is not an integer: {timestamp}")
         self.dataStore[name].append([timestamp, value])
 
         if time.time() * 1000 - self.lastChecked > UPLOAD_INTERVAL:
@@ -145,4 +145,4 @@ def onComplete(self):
             raise RuntimeError(self.error)
         self.uploadComplete = True
         self.dataStore = {x: [] for x in self.timeSeries}
-        return True
+        return True

src/edgeml/consts.py edgeml/consts.pysrc/edgeml/consts.py renamed to edgeml/consts.py

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -22,7 +22,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -37,8 +37,8 @@
     }
    ],
    "source": [
-    "readKey = \"4c1137ca4a959601522c5d4367c3737d\"  # Device API Read Access Key\n",
-    "writeKey = \"e49f4833a04db7647d9e6c43b38d247f\" # Device API Write Access Key\n",
+    "readKey = \"f81fc94a0f68d6780bc580b4b9a8d8fc\"  # Device API Read Access Key\n",
+    "writeKey = \"454014dfe1e39bca18ad61b80c1fedb6\" # Device API Write Access Key\n",
     "localUrl = \"http://localhost:3004\"   # Backend URL\n",
     "datasetName = \"Example Dataset\" # Name of the dataset\n",
     "useDeviceTime = False           # Change it to true if you want to use timestamps generated by the server \n",
@@ -76,9 +76,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 98,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "AttributeError",
+     "evalue": "module 'edgeml.edgeml' has no attribute 'getProject'",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mAttributeError\u001b[0m                            Traceback (most recent call last)",
+      "Input \u001b[0;32mIn [4]\u001b[0m, in \u001b[0;36m<cell line: 3>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m remoteUrl \u001b[38;5;241m=\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mhttps://app.edge-ml.org\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[1;32m      2\u001b[0m remoteKey \u001b[38;5;241m=\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mPSJSIwhSuN6TSK9LEMzuFbfXZwACWKYFFtKWxXy2Upkrmhv4U7MjD25b+QcPl0d20n6vsfBWV4Gz4iWBhSmnXw==\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[0;32m----> 3\u001b[0m project \u001b[38;5;241m=\u001b[39m \u001b[43medgeml\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mgetProject\u001b[49m(remoteUrl, remoteKey) \u001b[38;5;66;03m# retrieve project data from remote server\u001b[39;00m\n\u001b[1;32m      4\u001b[0m datasets \u001b[38;5;241m=\u001b[39m project[\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mdatasets\u001b[39m\u001b[38;5;124m'\u001b[39m]\n",
+      "\u001b[0;31mAttributeError\u001b[0m: module 'edgeml.edgeml' has no attribute 'getProject'"
+     ]
+    }
+   ],
    "source": [
     "remoteUrl = \"https://app.edge-ml.org\"\n",
     "remoteKey = \"PSJSIwhSuN6TSK9LEMzuFbfXZwACWKYFFtKWxXy2Upkrmhv4U7MjD25b+QcPl0d20n6vsfBWV4Gz4iWBhSmnXw==\"\n",
@@ -97,7 +109,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 99,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -138,7 +150,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 109,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -185,7 +197,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 100,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -218,7 +230,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 101,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -254,7 +266,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 102,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6266,7 +6278,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 103,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6377,7 +6389,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 104,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6409,7 +6421,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 105,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -6426,7 +6438,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 106,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6760,7 +6772,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 107,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6789,7 +6801,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 108,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -6808,11 +6820,8 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "916dbcbb3f70747c44a77c7bcd40155683ae19c65e1c03b4aa3499c5328201f1"
-  },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "edgeml",
    "language": "python",
    "name": "python3"
   },
@@ -6826,7 +6835,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.10.0"
   },
   "orig_nbformat": 4
  },

src/edgeml/edgeml.py edgeml/edgeml.pysrc/edgeml/edgeml.py renamed to edgeml/edgeml.py

@@ -0,0 +1,20 @@
+from edgeml import DatasetReceiver
+
+
+
+
+WRITE_KEY = "399b57a1a98c6f7450ef8235f086a815"
+READ_KEY = "0f1a0ea264a33383969f21b4b45b82ad"
+
+localUrl = "https://beta.edge-ml.org"
+datasetName = "Example Dataset"
+
+project = DatasetReceiver(localUrl, READ_KEY, WRITE_KEY)
+
+print(project)
+
+project.loadData()
+
+print(project.datasets[0].timeSeries[0].data.head())
+
+print(project.data)

notebook.ipynb

@@ -0,0 +1,41 @@
+import edgeml
+import time
+from tqdm.auto import tqdm
+
+
+WRITE_KEY = "399b57a1a98c6f7450ef8235f086a815"
+localUrl = "https://beta.edge-ml.org"
+datasetName = "Example Dataset"
+
+import math
+import asyncio
+
+timeSeries = ["Acc", "Mag"]
+metaData = {}
+
+async def main():
+    print("Creating DatasetCollector")
+    collector = edgeml.DatasetCollector(localUrl,
+                                        WRITE_KEY,
+                                        datasetName,
+                                        False,
+                                        timeSeries,
+                                        metaData)
+
+    print("DatasetCollector created")
+
+    timestamp = round(time.time() * 1000)
+    for i in tqdm(range(10)):
+        timestamp += 40
+        x = i / 10000        # Adjust the divisor to control the frequency of the wave
+        y_acc = math.sin(x)  # Generate the y-coordinate for "Acc"
+        y_mag = math.cos(x)  # Generate the y-coordinate for "Mag"
+        await collector.addDataPoint(timestamp, "Acc", y_acc)
+        await collector.addDataPoint(timestamp, "Mag", y_mag)
+
+    # signal data collection is complete
+    collector.onComplete()
+
+
+print("Starting data collection")
+asyncio.run(main())