Merge pull request #479 from Drakkar-Software/dev

Master merge
Drakkar-Software · Jun 5, 2021 · e6085a4 · e6085a4
2 parents 2bd8f33 + dbd7a3b
commit e6085a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Evaluator/RealTime/instant_fluctuations_evaluator/instant_fluctuations.py b/Evaluator/RealTime/instant_fluctuations_evaluator/instant_fluctuations.py
@@ -65,10 +65,14 @@ async def ohlcv_callback(self, exchange: str, exchange_id: str,
             self.average_volumes[segment] = np.mean(volume_data)
             self.average_prices[segment] = np.mean(price_data)
 
-        self.last_volume = volume_data[-1]
-        self.last_price = close_data[-1]
-        await self._trigger_evaluation(cryptocurrency, symbol,
-                                       evaluators_util.get_eval_time(full_candle=candle, time_frame=time_frame))
+        try:
+            self.last_volume = volume_data[-1]
+            self.last_price = close_data[-1]
+            await self._trigger_evaluation(cryptocurrency, symbol,
+                                           evaluators_util.get_eval_time(full_candle=candle, time_frame=time_frame))
+        except IndexError:
+            # candles data history is probably not yet available
+            self.logger.debug(f"Impossible to evaluate, no historical data for {symbol} on {time_frame}")
 
     async def kline_callback(self, exchange: str, exchange_id: str,
                              cryptocurrency: str, symbol: str, time_frame, kline):

diff --git a/Services/Interfaces/web_interface/advanced_controllers/tentacles.py b/Services/Interfaces/web_interface/advanced_controllers/tentacles.py
@@ -43,7 +43,7 @@ def _handle_package_operation(update_type):
                 action = "register_and_install"
             else:
                 path_or_url, action = next(iter(request_data.items()))
-                path_or_url = request_data.strip()
+                path_or_url = path_or_url.strip()
             if action == "register_and_install":
                 installation_result = models.install_packages(
                     path_or_url,

diff --git a/Services/Interfaces/web_interface/templates/profile.html b/Services/Interfaces/web_interface/templates/profile.html
@@ -39,7 +39,7 @@ <h5>
                        data-toggle="collapse"
                        href="#profilesSubmenu" role="tab" aria-expanded="false">
                         <span class="d-flex">
-                            <i class="fas fa-user"></i><span class="d-none d-md-block pl-3">Profiles</span>
+                            <i class="fas fa-users"></i><span class="d-none d-md-block pl-3">Profiles</span>
                         </span>
                     </a>
                     <ul class="collapse nav" id="profilesSubmenu">
@@ -49,7 +49,7 @@ <h5>
                                data-toggle="pill"
                                href="#panelProfile{{profile_id}}" role="tab" aria-controls="panelProfile{{profile_id}}"
                                aria-selected="false">
-                                <i class="fas fa-id-card"></i>
+                                <i class="fas {{'fa-user-lock' if profile.read_only else 'fa-user '}}"></i>
                                 <span class="d-none d-md-block pl-3" data-role="profile-name" data-profile-id="{{profile_id}}">{{profile.name}}</span>
                                 {% if profile_id == current_profile.profile_id %}
                                 <i class="fas fa-check ml-1 ml-md-2"></i>