From f3821a8f4f81b61531902aeb850296917f92eb12 Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Wed, 28 Jun 2023 20:14:30 +0200
Subject: [PATCH] insert via queue a single writer

---
 testy/migrace/migracesql.py                   |   2 +-
 v2realbot/common/db.py                        |  30 +++++++-
 v2realbot/controller/services.py              |  46 +++++++++----
 .../__pycache__/aggregator.cpython-310.pyc    | Bin 7085 -> 6994 bytes
 v2realbot/loader/aggregator.py                |  21 +++---
 v2realbot/main.py                             |  31 ++++++++-
 v2realbot/static/js/archivetables.js          |  18 ++---
 .../strategy/__pycache__/base.cpython-310.pyc | Bin 14325 -> 14331 bytes
 v2realbot/strategy/base.py                    |   6 +-
 v2realbot/utils/ilog.py                       |  65 ++++++++++++------
 10 files changed, 160 insertions(+), 59 deletions(-)

diff --git a/testy/migrace/migracesql.py b/testy/migrace/migracesql.py
index 3bdb177..7965878 100644
--- a/testy/migrace/migracesql.py
+++ b/testy/migrace/migracesql.py
@@ -132,7 +132,7 @@ def migrate():
     res, set = get_all_archived_runners_detail()
     print(f"fetched {len(set)}")
     for row in set:
-        insert_archive_detail(row)
+        #insert_archive_detail(row)
         print(f"inserted {row['id']}")
 
 bars = {'high': [], 
diff --git a/v2realbot/common/db.py b/v2realbot/common/db.py
index 4e2d43a..91ffa32 100644
--- a/v2realbot/common/db.py
+++ b/v2realbot/common/db.py
@@ -1,5 +1,33 @@
 from v2realbot.config import DATA_DIR
 import sqlite3
+import queue
+import threading
 
 sqlite_db_file = DATA_DIR + "/v2trading.db"
-conn = sqlite3.connect(sqlite_db_file, check_same_thread=False, isolation_level=None)
\ No newline at end of file
+# Define the connection pool
+class ConnectionPool:
+    def __init__(self, max_connections):
+        self.max_connections = max_connections
+        self.connections = queue.Queue(max_connections)
+        self.lock = threading.Lock()
+
+    def get_connection(self):
+        with self.lock:
+            if self.connections.empty():
+                return self.create_connection()
+            else:
+                return self.connections.get()
+
+    def release_connection(self, connection):
+        with self.lock:
+            self.connections.put(connection)
+
+    def create_connection(self):
+        connection = sqlite3.connect(sqlite_db_file, check_same_thread=False)
+        return connection
+
+#for pool of connections if necessary
+pool = ConnectionPool(10)
+#for one shared connection (used for writes only in WAL mode)
+insert_conn = sqlite3.connect(sqlite_db_file, check_same_thread=False)
+insert_queue = queue.Queue()
\ No newline at end of file
diff --git a/v2realbot/controller/services.py b/v2realbot/controller/services.py
index 4886dc9..2243c86 100644
--- a/v2realbot/controller/services.py
+++ b/v2realbot/controller/services.py
@@ -22,7 +22,7 @@ import pandas as pd
 from traceback import format_exc
 from datetime import timedelta, time
 from threading import Lock
-from v2realbot.common.db import conn
+from v2realbot.common.db import pool
 #adding lock to ensure thread safety of TinyDB (in future will be migrated to proper db)
 lock = Lock()
 
@@ -602,9 +602,14 @@ def edit_archived_runners(runner_id: UUID, archChange: RunArchiveChange):
 
 #returns number of deleted elements
 def delete_archive_detail_byID(id: UUID):
-    c = conn.cursor()
-    res = c.execute(f"DELETE from runner_detail WHERE runner_id='{str(id)}';")
-    print("deleted", res.rowcount)
+    conn = pool.get_connection()
+    try:
+        c = conn.cursor()
+        res = c.execute(f"DELETE from runner_detail WHERE runner_id='{str(id)}';")
+        conn.commit()
+        print("deleted", res.rowcount)
+    finally:
+        pool.release_connection(conn)
     return res.rowcount
 
 # def get_all_archived_runners_detail_old():
@@ -612,9 +617,13 @@ def delete_archive_detail_byID(id: UUID):
 #     return 0, res
 
 def get_all_archived_runners_detail():
-    conn.row_factory = lambda c, r: json.loads(r[0])
-    c = conn.cursor()
-    res = c.execute(f"SELECT data FROM runner_detail")
+    conn = pool.get_connection()
+    try:
+        conn.row_factory = lambda c, r: json.loads(r[0])
+        c = conn.cursor()
+        res = c.execute(f"SELECT data FROM runner_detail")
+    finally:
+        pool.release_connection(conn)        
     return 0, res.fetchall()
 
 # def get_archived_runner_details_byID_old(id: UUID):
@@ -626,19 +635,28 @@ def get_all_archived_runners_detail():
 
 #vrátí konkrétní
 def get_archived_runner_details_byID(id: UUID):
-    conn.row_factory = lambda c, r: json.loads(r[0])
-    c = conn.cursor()
-    result = c.execute(f"SELECT data FROM runner_detail WHERE runner_id='{str(id)}'")
-    res= result.fetchone()
+    conn = pool.get_connection()
+    try:
+        conn.row_factory = lambda c, r: json.loads(r[0])
+        c = conn.cursor()
+        result = c.execute(f"SELECT data FROM runner_detail WHERE runner_id='{str(id)}'")
+        res= result.fetchone()
+    finally:
+        pool.release_connection(conn)
     if res==None:
         return -2, "not found"
     else:
         return 0, res
 
 def insert_archive_detail(archdetail: RunArchiveDetail):
-    c = conn.cursor()
-    json_string = json.dumps(archdetail, default=json_serial)
-    res = c.execute("INSERT INTO runner_detail VALUES (?,?)",[str(archdetail.id), json_string])
+    conn = pool.get_connection()
+    try:
+        c = conn.cursor()
+        json_string = json.dumps(archdetail, default=json_serial)
+        res = c.execute("INSERT INTO runner_detail VALUES (?,?)",[str(archdetail.id), json_string])
+        conn.commit()
+    finally:
+        pool.release_connection(conn)
     return res.rowcount
 
 #returns b
diff --git a/v2realbot/loader/__pycache__/aggregator.cpython-310.pyc b/v2realbot/loader/__pycache__/aggregator.cpython-310.pyc
index 2db0c226997d623cd66e0d992746a9993d5ddff8..8602c0e944cbb1ffce905d6107359431f9adbdba 100644
GIT binary patch
delta 755
zcmZ8f&ubGw6n<|vWSiY=nl#yDH=7^ZYOSeC(V#`hNf8f%9ts|c5~LGCHf>fmTNK>T
zLk=FaT9}Ji!4|zJ2ucom_770hTktP1caP%RO<J@&?94as`@Z+y%<jA8?-x`@Rb`;(
z^PA`F_XqWD46VVZ*fUHun9_^-U}u=x7Th15+x(7l24noGvJ?@SZ18xzv}KY&^Pyf~
zD$Q9RB48I;Vi^Re7nw>U9nJxwLFyvQypTytF1zH5OfsM??4Vm?3Ptsf$l}2|W(bwM
zC}G)vJ`$pK`ly3fZUcF4CPJ}Aroe3RkMZhxtp?s~&=$)YFiz7K#(QGsLX<ng<ak*v
zZ|MfGL=HlQPTFIKS%PfjnQ+?wh#4lZ{G^6i13$_XI+EZj2Ztbcf#P5vr=~}qycaNZ
zq<!p3zU0mOl6}I5jGfK`!39>_7If%IBs|H#sb|$vXikUil=*a`a=Fk)`YaJDa=i(?
zDQ}Uu{9){zKecx%i0mUmiwf8ClSm<mG=oTiKS)%sJR#L-$|O>zdxXu&s<Dy*)L6h;
z+n9rYn-1%GO;~~O+D+b84AWxDCXo9vd9)_3P?hmpndJ-9Klyxe_2O0f&xR4_ZlhBX
zhElh&=5$zh7~g2Exz52Z;<Yv!L)mR~o%Kzx<#a0OUgIy5ulRauiC;=B^4(Mqzi?yb
vhLFq*+?o3#I((%4L685+zDIkoo2w!|8hq7FM9xRXYkWA^$>&kLl_~xORg1z;

delta 819
zcmZ`%OKTHR6h3DXI?YUG%zGYbp0#R<T4QLtDdI*{5L|R2x(S6FLZ@w_=@bMf6pWw<
zp^>{$=psc|g3vMu`UC6_P;?RWCx}aT>Y16gXu-M6z326P=bU@)$GJE2N?TDRps)O!
zvx|Gm>j+xzyU25lKV@=v%mFLKlog@#sr8UA$>;Dq-;!slU}Xo`F>PrmJ0T_+u!CLE
z5$y>_v~q+=W`LwTOZEjFx?(HBpDD>rX;^T?9b_pTC??Gk3(yh+{GraG4%CaDMrVmB
zv}YU$gH>kgJP1%PGlf>#-#v*IMVDD-TcTJ(S(C&l8n7Zzg-c8(tKJHEymNIuaFJ=!
z9t#rpkR)odhdS6NSAakd{350Z<bkL7TC_H+Er5N>D~ss{1S~xv(8+V!myBZ`gMW?|
zHcbPVss#<36no}~#bYDPflvEaV%aRPiGv)u1#rfgOf3nW3x_=rI!|_Q6hbHVzfq))
z&w>IA{IOD13O+dLms8{)luDu0Lz;D%=+>Li9k-{+XCB#ZaYZ%c(hedtDQ&&Pt7`3v
zOEG5&6(ZC&$;E>+%?bw4d+@xaK5FoHfqsq`O;`l~ii^ag<-nR^@&*uok5K6*E>fQ0
zuax;W^()WCj7YQp{q6AQ{_Z9I{=}W)b$Ym?aQkkfH459yYmJfAX{@(bH|*thtAd@Y
z{6_30&&Q|vkJt>q7VqL0z8}9SjgPB1fr)S?<Z6lgAzbBy^e?=}w=%ofbT4Z)#3!z;
UXAuW{V7$Ud?yPBI=yodi2Rjqa6951J

diff --git a/v2realbot/loader/aggregator.py b/v2realbot/loader/aggregator.py
index 8d8e669..1403f37 100644
--- a/v2realbot/loader/aggregator.py
+++ b/v2realbot/loader/aggregator.py
@@ -198,16 +198,19 @@ class TradeAggregator:
                     #zkousime potvrzeni baru dat o chlup mensi cas nez cas noveho baru, ktery jde hned za nim
                     #gui neumi zobrazit duplicity a v RT grafu nejde upravovat zpetne
                     #zarovname na cas  baru podle timeframu(např. 5, 10, 15 ...) (ROUND)
-                    if self.align:
-                        t = datetime.fromtimestamp(data['t'])
-                        t = t - timedelta(seconds=t.second % self.timeframe,microseconds=t.microsecond)
-                    #nebo pouzijeme datum tradu zaokrouhlene na vteriny (RANDOM)
-                    else:
-                        #ulozime si jeho timestamp (odtum pocitame timeframe)
-                        t = datetime.fromtimestamp(int(data['t']))
 
-                    #self.newBar['updated'] = float(data['t']) - 0.001
-                    self.newBar['updated'] = datetime.timestamp(t) - 0.000001
+                    #MUSIME VRATIT ZPET - ten upraveny cas způsobuje spatne plneni v BT, kdyz tento bar triggeruje nakup
+                    # if self.align:
+                    #     t = datetime.fromtimestamp(data['t'])
+                    #     t = t - timedelta(seconds=t.second % self.timeframe,microseconds=t.microsecond)
+                    # #nebo pouzijeme datum tradu zaokrouhlene na vteriny (RANDOM)
+                    # else:
+                    #     #ulozime si jeho timestamp (odtum pocitame timeframe)
+                    #     t = datetime.fromtimestamp(int(data['t']))
+
+                    # #self.newBar['updated'] = float(data['t']) - 0.001
+                    # self.newBar['updated'] = datetime.timestamp(t) - 0.000001
+                    self.newBar['updated'] = data['t']
                 #PRO standardní BAR nechavame puvodni
                 else:
                     self.newBar['updated'] = data['t']
diff --git a/v2realbot/main.py b/v2realbot/main.py
index 4710279..bc5e37a 100644
--- a/v2realbot/main.py
+++ b/v2realbot/main.py
@@ -26,6 +26,8 @@ import json
 from queue import Queue, Empty
 from threading import Thread
 import asyncio
+from v2realbot.common.db import insert_queue, insert_conn
+from v2realbot.utils.utils import json_serial
 #from async io import Queue, QueueEmpty
                    
 # install()
@@ -329,14 +331,41 @@ def _get_alpaca_history_bars(symbol: str, datetime_object_from: datetime, dateti
     else:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"No data found {res} {set}")
 
+# Thread function to insert data from the queue into the database
+def insert_queue2db():
+    print("starting insert_queue2db thread")
+    while True:
+        # Retrieve data from the queue
+        data = insert_queue.get()
+
+        # Unpack the data
+        runner_id, loglist = data
+
+        c = insert_conn.cursor()
+        insert_data = []
+        for i in loglist:
+            row = (str(runner_id), i["time"], json.dumps(i, default=json_serial))
+            insert_data.append(row)
+        c.executemany("INSERT INTO runner_logs VALUES (?,?,?)", insert_data)
+        insert_conn.commit()
+        # Mark the task as done in the queue
 
 #join cekej na dokonceni vsech
 for i in cs.db.runners:
     i.run_thread.join()
 
 if __name__ == "__main__":
-    uvicorn.run("__main__:app", host="0.0.0.0", port=8000, reload=False)
+    try:
+        #TOTO predelat na samostatnou tridu typu vlakna a dat do separatniho souboru, draft jiz na chatgpt
+        #spusteni vlakna pro zapis logů (mame single write vlakno, thready dodávají pres queue)
+        insert_thread = Thread(target=insert_queue2db)
+        insert_thread.start()
 
+        uvicorn.run("__main__:app", host="0.0.0.0", port=8000, reload=False)
+    finally:
+        print("closing insert_conn connection")
+        insert_conn.close()
+        print("closed")
 ##TODO pridat moznost behu na PAPER a LIVE per strategie
 
 # zjistit zda order notification websocket muze bezet na obou soucasne
diff --git a/v2realbot/static/js/archivetables.js b/v2realbot/static/js/archivetables.js
index 10bd6bc..44eddfc 100644
--- a/v2realbot/static/js/archivetables.js
+++ b/v2realbot/static/js/archivetables.js
@@ -254,18 +254,20 @@ var archiveRecords =
                     if (type == "sort") {
                         return new Date(data).getTime();
                     }
-                    
+                    var date = new Date(data);
+                    tit = date.toLocaleString('cs-CZ', {
+                            timeZone: 'America/New_York',
+                          })
+
                     if (isToday(now)) {
                         //return local time only
-                        return 'dnes ' + format_date(data,false,true)
+                        return '<div title="'+tit+'">'+ 'dnes ' + format_date(data,false,true)+'</div>'
                     }
                     else
                     {
                         //return  local datetime
-                        return format_date(data,false,false)
+                        return '<div title="'+tit+'">'+ format_date(data,false,false)+'</div>'
                     }
-                    
-                    
                 },
                 },
                 {
@@ -282,7 +284,7 @@ var archiveRecords =
                 {
                     targets: [2],
                     render: function ( data, type, row ) {
-                        return '<div class="tdname" title="'+data+'">'+data+'</i>'
+                        return '<div class="tdname" title="'+data+'">'+data+'</div>'
                     },
                 },
                 {
@@ -290,13 +292,13 @@ var archiveRecords =
                     render: function ( data, type, row ) {
                         var res = JSON.stringify(data)
                         const unquoted = res.replace(/"([^"]+)":/g, '$1:')
-                        return '<div class="tdmetrics" title="'+unquoted+'">'+unquoted+'</i>'
+                        return '<div class="tdmetrics" title="'+unquoted+'">'+unquoted+'</div>'
                     },
                 },
                 {
                     targets: [4],
                     render: function ( data, type, row ) {
-                        return '<div class="tdnote" title="'+data+'">'+data+'</i>'
+                        return '<div class="tdnote" title="'+data+'">'+data+'</div>'
                     },
                 },
                 {
diff --git a/v2realbot/strategy/__pycache__/base.cpython-310.pyc b/v2realbot/strategy/__pycache__/base.cpython-310.pyc
index 595d2104feb94e8024c98ea0fafec9d5b254c150..70879fbb2612548b989728b872a6f0d12c4b4133 100644
GIT binary patch
delta 2260
zcmZvdYfKzf6vw&4vfY9_mI5x6c8jo<fl{D=O=GczVybDRfPvc5W>|Iy*s{B`+?j=z
zs--nHlE#MQHr5u5CXFK6*675TNPO2veN@{TYvzkKF?{fmXpHfLN%j8kr0jNu4?oU5
zuQ~VJbMOA8{iEe*+1Z(C{O_R+Gr^3p*K?|*;^I(LSE-?dwLv8k4;!IaSXD;iYTVo*
z{h2{5w#79_I?P$u6shj!p>!AU2(TO21N3mn%V{&@7NDE;XEtr!32_}DEFv7POXaYf
zx<OTcgm%C|pwqmbS)5MxvOlt)BKz2QPU(7)u?`-6fFB3|+km7{EZfbCIh!TY%ZR&(
zgqg?PxDxS}BV?!%x;-U=4Z8m(QKsY<5{<?4D@t|lFeg#*$<Y*N^UeI_q%DGM#E@6m
z`^$lo1|U>4!paT%bwe?zKd353D5BCZOkxLlkOr7k;ByW_9AY&E#d(JyCT+y*DY!)P
zj;2P{7S%h)pnQ}K6b*V8i?q@MQDaZKp$2bD@@vt8L`K=QVx?g(qFjslsv-3Oq8_^v
zEJJ_<Ofa>??>-JOi^Fp0h8E+MUoY_%rj`q*J~L~jhh!zCV(UvQ`8n<?^?Jk!kWg}U
zh&gGVD1Csi?vh;R1lC8`FRQxw(Y35@s}P%e7FuC?0a8+jupDM{s}GeV98=6^*?rz^
zH7~()7I+z$15zAc<hpsn^{=oC-f%XY`CQk*Gmmwatf-!Vcmxo0zL`sN#Ga9qR5MIn
z(_1Do5ITd1SAi6-W9-J7o*LWB%GK3qP~n#`9t-*nRi{gJcajCmc6h}$M6RW>PMMd>
z_DQXjf6#J@;nQghU*}s(qfuZJ(9dDHbi;3iqCs6wr`Qi22M!8}MJk31HHa8#D?O}6
z?TyFSZxwg?3|KAzw+C8|Q9sq`Yp}e*WM6sVG{Up_#iQb-35WP?e}?&eYn|fIM%f9U
zr|>lVQyO&6ocFy$cArOlCRKGU95+H*lz(B&9}`=#GI;Uo0gBtm&!QLqB+EU-KcUfs
z3RMSGszw7UeRqlUBkaoBpPL>-c5=WXF^lLH3D8qQF-||@|7D4Oj>s>7r0UGyE1QV(
zJ!tz`U6rTxB1F*$R7*bwJ^@6-KZS%E?HrdDC6Tfd%Q$<oN_P%HoMtzxJcplvcsEeV
zVLAFWElj(xPP{d_uw-=Y>~3$P3QXe8wnMTX2uMeP<3Jy95-10TfwKTc-=5QBkR~~r
z=@i6s9M&CTN&*qp7}A3DLFh+-D?l7bw8q|%d9^x&kp1TO>v|+7Mv<Op<JqNVM{O-R
z{65wn0HSLjLiz|0{Y+`1=%47M=pQ;MFQYg#`X%rca2fa-z~RwvIAkJ@LtaJSf@&*Z
z4>!A6cUQyXSc@N}dmyy}8-aAdt{74but%LeT;I^}HeXxL7}W+s27MmJIu1F@eg>+c
z5I=hLkP;hrCv~V3rY^QnKS@rTu?-Hg=|`@)bpfA)RVW<xJPE~(TUv@w$hk?+(v}I>
zjsT){1CYdi#6h88aW6!qc>HCjU9GrsKd^rrit;+(B_OIh!+eeRmtTeQ8t^TLwM<ch
zT0l{f=5Lxk-RNog4lZ5586c4>k#IjZY?so~bQc#~X%5on^4v?Im7D2L=0f8sscN3D
XEJr*Z3W|xRGG7aq|7B#e8{7W_Uql3R

delta 2310
zcma)-e{54#6vw%3SGvxPbz@_UvNB+@j_D}d;*WsQu>}bkFf&Npz*^eJ*7dcop7%O_
zX$B@FQ~!YEs(=_xh$0iFAx}+|OvK;d5BwSRCZLIlCWe31D1Z2m_j{kLrP&|uk5A7%
z_uTW&Irp5qe~iD33ZuN-KTH0-e&={%YV=G+i>tainK3o8qPj5@P3Lqgnbqw+*PkV9
zfcN-@*hYKOcZjimKIyNk+ANQTOKG+Ip?iRSKJ4$T+yJo^P&@tnq(3-UcukA6SeiCs
zLt&GB*+1XS2Klw}akiE3s|enzj;?@36nGHW4y*wRj$+wsU#wW=svD59@W--QEt80D
zkCE_5n3UoTfsO@mC_G6^OVipS7d#!fHZKk39TL~`sDL8F_f{<pk`yOgq+-fJUGRPT
zY*i_%*QHi4D_rel>YRlo@hjE!l_`iSn@UI;_swl;+W~P1a7hSv#@H!Jtz=p=tynrs
zd$3dZp{;W-u*&_=7JBNejd(|)+{^Xaq0n@U!X3|818z%8+~DMo+Fx8O$A6d~Z6Cxb
z-?YEwkW{f%jQQw>v4Ie2jHl{jfyW`1NeGW=8CjXl<@!)fakwyw+JOaitgOHl?+7-_
zd)^id)ge;Bl7-RX47Z;Q-pgw8XPhr%Yajo8;bz%>Ya6<ksyq)vI|e)t6ch`~5&mk!
z-uk>@(e`oP9a?kCi?BQayab#CiVR<ny0c8`C-`e2eLak2kL2%Q#!%r$O~NWEO)#f-
ziX0!~sYQd0${(X+IPo%2WOac5x@ZeK!S8CEH)D~<`AFmXkV-+FoXN*Q`<upXuC9lq
zd*QVxme5Qx@GY6vEShe8iow7q`_D>d5@y&<h@N%>yOhMurK!FQM9hS6>srQ16W&A#
z#>*7`b(w^=tB1%SGGRLj+~`VpMlqYOVCM{PYg$tC3_O%e52T(PJt?1wr}$9QvUYWa
zn7aY5e2<Krr6yREjK=hwMn~YHsAi|^^G#EXo#tc9YP*o03=J_6=2YGWUWy5q2n@@Q
z7_>V|+76AhOkAU>8N6lrcgue3d>C%nF2S;bnS#aXX{FdhAIaaai!R{gMW7%U`|svX
zR`xcus4bo2k(RpEsuZWOejoS%P?zu_B*f_W_;^}UE;nIm@h4i$G4*VyiuvL(U5{<o
zHLAk48+a7B8EBS}&!A!G)Q5Eipzd!Dc1rHsxOqc2JpiqmvtCHfa{_5UpypjY3>?cP
z5`#1X@i>6-aJu&Zq;cRNa7selq?#$7)~sP8LF=H;0$%_Ykgt}Lr2YN!62_ADmDVjT
zFFKY^^FVpE-P?9M8#{;fJHUIudEi|@mAI&`s-&v8s-!4xcsAi4=@Z~n;4|QJ0QX6k
zB*IKJYj`2O0oC1rGXvZcS?qlT>wexEsjG3q!`c9xX6N@u+S}ihYvIk3u_I~GbJ$!V
z5iWBc0`=CmLK^|{S@Pbt(m+8;HetJuUyVG*j@Y9sJ#6epxcP4|pT(|Hc%1Q4il44)
z37-ki`9DvUs+@*{U4XhLq@X56`BDEV!rqlm0&3{4NCV+b?TpcoslG4VWb7=C{wQDG
z(G&d=&b|V^#;MuSXu^m`qXi9#Zg$$Y0TMcw76ab`eZWzmxL=@4@=F~xzN8extLbO^
cYR6$$%Ug0KJh@yl;rI$GL!j6LpS*3uzdn!<cK`qY

diff --git a/v2realbot/strategy/base.py b/v2realbot/strategy/base.py
index 1c4b1ed..4da838f 100644
--- a/v2realbot/strategy/base.py
+++ b/v2realbot/strategy/base.py
@@ -4,7 +4,7 @@
 from datetime import datetime
 from v2realbot.utils.utils import AttributeDict, zoneNY, is_open_rush, is_close_rush, json_serial, print, safe_get, Average
 from v2realbot.utils.tlog import tlog
-from v2realbot.utils.ilog import insert_log, insert_log_multiple
+from v2realbot.utils.ilog import insert_log, insert_log_multiple_queue
 from v2realbot.enums.enums import RecordType, StartBarAlign, Mode, Order, Account
 from v2realbot.config import BT_DELAYS, get_key, HEARTBEAT_TIMEOUT, QUIET_MODE, LOG_RUNNER_EVENTS
 import queue
@@ -534,8 +534,8 @@ class Strategy:
 
             #cleaning iterlog lsit
             #TODO pridat cistku i mimo RT blok
-        
-        if self.ilog_save: insert_log_multiple(self.state.runner_id, self.state.iter_log_list)
+        #vlozime do queue, odtud si to bere single zapisovaci thread
+        if self.ilog_save: insert_log_multiple_queue(self.state.runner_id, self.state.iter_log_list)
         #smazeme logy
         self.state.iter_log_list = []
 
diff --git a/v2realbot/utils/ilog.py b/v2realbot/utils/ilog.py
index 5d322e8..251c85b 100644
--- a/v2realbot/utils/ilog.py
+++ b/v2realbot/utils/ilog.py
@@ -4,7 +4,9 @@ from uuid import UUID, uuid4
 import json
 from datetime import datetime
 from v2realbot.enums.enums import RecordType, StartBarAlign, Mode, Account
-from v2realbot.common.db import conn
+from v2realbot.common.db import pool, insert_queue
+import sqlite3
+
 
 #standardne vraci pole tuplů, kde clen tuplu jsou sloupce
 #conn.row_factory = lambda c, r: json.loads(r[0])
@@ -22,42 +24,61 @@ from v2realbot.common.db import conn
 #insert = dict(time=datetime.now(), side="ddd", rectype=RecordType.BAR, id=uuid4())
 #insert_list = [dict(time=datetime.now().timestamp(), side="ddd", rectype=RecordType.BAR, id=uuid4()),dict(time=datetime.now().timestamp(), side="ddd", rectype=RecordType.BAR, id=uuid4()),dict(time=datetime.now().timestamp(), side="ddd", rectype=RecordType.BAR, id=uuid4()),dict(time=datetime.now().timestamp(), side="ddd", rectype=RecordType.BAR, id=uuid4())]
 
+
+#TOTO PREDELAT NA OBJEKT, který bude mít per thread svoji connectionu
+
 #returns rowcount of inserted rows
 def insert_log(runner_id: UUID, time: float, logdict: dict):
-    c = conn.cursor()
-    json_string = json.dumps(logdict, default=json_serial)
-    res = c.execute("INSERT INTO runner_logs VALUES (?,?,?)",[str(runner_id), time, json_string])
-    conn.commit()
+    conn = pool.get_connection()
+    try:
+        c = conn.cursor()
+        json_string = json.dumps(logdict, default=json_serial)
+        res = c.execute("INSERT INTO runner_logs VALUES (?,?,?)",[str(runner_id), time, json_string])
+        conn.commit()
+    finally:
+        pool.release_connection(conn)
     return res.rowcount
 
 #returns rowcount of inserted rows
-def insert_log_multiple(runner_id: UUID, loglist: list):
-    c = conn.cursor()
-    insert_data = []
-    for i in loglist:
-        row = (str(runner_id), i["time"], json.dumps(i, default=json_serial))
-        insert_data.append(row)
-    c.executemany("INSERT INTO runner_logs VALUES (?,?,?)", insert_data)
-    #conn.commit()
-    return c.rowcount
+#single connection in WAL mode
+def insert_log_multiple_queue(runner_id:UUID, loglist: list):
+    insert_queue.put((runner_id, loglist))
+
+# def insert_log_multiple(runner_id: UUID, loglist: list):
+#     conn = sqlite3.connect(sqlite_db_file, check_same_thread=False)
+#     c = conn.cursor()
+#     insert_data = []
+#     for i in loglist:
+#         row = (str(runner_id), i["time"], json.dumps(i, default=json_serial))
+#         insert_data.append(row)
+#     c.executemany("INSERT INTO runner_logs VALUES (?,?,?)", insert_data)
+#     conn.commit()
+#     return c.rowcount
 
 #returns list of ilog jsons
 def get_log_window(runner_id: UUID, timestamp_from: float = 0, timestamp_to: float = 9682851459):
-    conn.row_factory = lambda c, r: json.loads(r[0])
-    c = conn.cursor()
-    res = c.execute(f"SELECT data FROM runner_logs WHERE runner_id='{str(runner_id)}' AND time >={timestamp_from} AND time <={timestamp_to} ORDER BY time")
+    conn = pool.get_connection()
+    try:
+        conn.row_factory = lambda c, r: json.loads(r[0])
+        c = conn.cursor()
+        res = c.execute(f"SELECT data FROM runner_logs WHERE runner_id='{str(runner_id)}' AND time >={timestamp_from} AND time <={timestamp_to} ORDER BY time")
+    finally:
+        pool.release_connection(conn)
     return res.fetchall()
 
 #returns number of deleted elements
 def delete_logs(runner_id: UUID):
-    c = conn.cursor()
-    res = c.execute(f"DELETE from runner_logs WHERE runner_id='{str(runner_id)}';")
-    print(res.rowcount)
-    conn.commit()
+    conn = pool.get_connection()
+    try:
+        c = conn.cursor()
+        res = c.execute(f"DELETE from runner_logs WHERE runner_id='{str(runner_id)}';")
+        print(res.rowcount)
+        conn.commit()
+    finally:
+        pool.release_connection(conn)
     return res.rowcount
 
 
-
 # print(insert_log(str(uuid4()), datetime.now().timestamp(), insert))
 # c = conn.cursor()
 # ts_from = 1683108821.08872