layrz-sdk 3.0.4__tar.gz → 3.0.6__tar.gz

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layrz-sdk
-Version: 3.0.4
+Version: 3.0.6
 Summary: Layrz SDK for Python
 Author-email: "Golden M, Inc." <software@goldenm.com>
 Maintainer-email: Kenny Mochizuki <kenny@goldenm.com>, Luis Reyes <lreyes@goldenm.com>, Kasen Li <kli@goldenm.com>

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/__init__.py

@@ -4,11 +4,11 @@ from .broadcasts import (BroadcastRequest, BroadcastResponse, BroadcastResult, B
 # Cases entitites
 from .cases import Case, CaseIgnoredStatus, CaseStatus, Comment, Trigger
 # Charts entities
-from .charts import (AreaChart, BarChart, ChartAlignment, ChartConfiguration, ChartDataSerie, ChartDataSerieType,
-                     ChartDataType, ChartException, ChartRenderTechnology, ColumnChart, HTMLChart, LineChart,
-                     MapCenterType, MapChart, MapPoint, NumberChart, PieChart, RadarChart, RadialBarChart, ScatterChart,
-                     ScatterSerie, ScatterSerieItem, TableChart, TableHeader, TableRow, TimelineChart, TimelineSerie,
-                     TimelineSerieItem)
+from .charts import (AreaChart, AxisConfig, BarChart, ChartAlignment, ChartColor, ChartConfiguration, ChartDataSerie,
+                     ChartDataSerieType, ChartDataType, ChartException, ChartRenderTechnology, ColumnChart, HTMLChart,
+                     LineChart, MapCenterType, MapChart, MapPoint, NumberChart, PieChart, RadarChart, RadialBarChart,
+                     ScatterChart, ScatterSerie, ScatterSerieItem, TableChart, TableHeader, TableRow, TimelineChart,
+                     TimelineSerie, TimelineSerieItem, get_color_list)
 # Checkpoints entities
 from .checkpoints import Checkpoint, Geofence, Waypoint
 # Events entities

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/__init__.py

@@ -1,8 +1,9 @@
 """ Charts entities """
 from .alignment import ChartAlignment
 from .bar import BarChart
+from .color import ChartColor, get_color_list
 from .column import ColumnChart
-from .configuration import ChartConfiguration
+from .configuration import ChartConfiguration, AxisConfig
 from .data_type import ChartDataType
 from .exceptions import ChartException
 from .html import HTMLChart

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/alignment.py

@@ -13,7 +13,7 @@ class ChartAlignment(Enum):
   @property
   def _readable(self) -> str:
     """ Readable """
-    return f'BroadcastStatus.{self.value}'
+    return f'ChartAlignment.{self.value}'
 
   def __str__(self) -> str:
     """ Readable property """

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/bar.py

@@ -1,6 +1,8 @@
 """ Bar chart """
 from .alignment import ChartAlignment
+from .configuration import AxisConfig
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 from .serie import ChartDataSerie
 from .serie_type import ChartDataSerieType
 
@@ -16,6 +18,8 @@ class BarChart:
     y_axis: list[ChartDataSerie],
     title: str = 'Chart',
     align: ChartAlignment = ChartAlignment.CENTER,
+    x_axis_config: AxisConfig = None,
+    y_axis_config: AxisConfig = None,
   ) -> None:
     """
     Constructor
@@ -27,6 +31,8 @@ class BarChart:
                  Please read the documentation to more information.
       - title : Title of the chart
       - align : Alignment of the title
+      - x_axis_config : Configuration of the X Axis
+      - y_axis_config : Configuration of the Y Axis
     """
     for i, serie in enumerate(y_axis):
       if not isinstance(serie, ChartDataSerie):
@@ -45,7 +51,24 @@ class BarChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
-  def render(self, use_new_definition: bool = False) -> dict | list[dict]:
+    if x_axis_config is None:
+      x_axis_config = AxisConfig()
+
+    if not isinstance(x_axis_config, AxisConfig):
+      raise ChartException('x_axis_config must be an instance of AxisConfig')
+    self.x_axis_config = x_axis_config
+
+    if y_axis_config is None:
+      y_axis_config = AxisConfig()
+
+    if not isinstance(y_axis_config, AxisConfig):
+      raise ChartException('y_axis_config must be an instance of AxisConfig')
+    self.y_axis_config = y_axis_config
+
+  def render(
+    self,
+    technology: ChartRenderTechnology = ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS,
+  ) -> dict:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: GRAPHIC and APEXCHARTS.
@@ -53,17 +76,67 @@ class BarChart:
     GRAPHIC is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     APEXCHARTS is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.GRAPHIC:
       return {
         'library': 'GRAPHIC',
         'chart': 'BAR',
         'configuration': self._render_graphic(),
       }
 
+    if technology == ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS:
+      return {
+        'library': 'SYNCFUSION_FLUTTER_CHARTS',
+        'chart': 'BAR',
+        'configuration': self._render_syncfusion_flutter_charts(),
+      }
+
+    if technology == ChartRenderTechnology.APEX_CHARTS:
+      return {
+        'library': 'APEXCHARTS',
+        'chart': 'BAR',
+        'configuration': self._render_apexcharts(),
+      }
+
+    return {
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported rendering technology {technology.name}'],
+    }
+
+  def _render_syncfusion_flutter_charts(self) -> list[dict]:
+    """
+    Converts the configuration of the chart to Syncfusion Flutter Charts.
+    """
+    series = []
+
+    for serie in self.y_axis:
+      values = []
+      for i, value in enumerate(serie.data):
+        x_axis = self.x_axis.data[i]
+        values.append({'xAxis': x_axis, 'yAxis': value})
+
+      series.append({
+        'label': serie.label,
+        'color': serie.color,
+        'values': values,
+      })
+
     return {
-      'library': 'APEXCHARTS',
-      'chart': 'BAR',
-      'configuration': self._render_apexcharts(),
+      'series': series,
+      'xAxis': {
+        'label': self.x_axis_config.label,
+        'measureUnit': self.x_axis_config.measure_unit,
+        'dataType': self.x_axis_config.data_type.value,
+        'minValue': self.x_axis_config.min_value,
+        'maxValue': self.x_axis_config.max_value,
+      },
+      'yAxis': {
+        'label': self.y_axis_config.label,
+        'measureUnit': self.y_axis_config.measure_unit,
+        'dataType': self.y_axis_config.data_type.value,
+        'minValue': self.y_axis_config.min_value,
+        'maxValue': self.y_axis_config.max_value,
+      },
     }
 
   def _render_graphic(self) -> list[dict]:

layrz_sdk-3.0.6/layrz_sdk/entities/charts/color.py

@@ -0,0 +1,35 @@
+""" Chart alignment """
+from enum import Enum
+
+
+class ChartColor(Enum):
+  """ Chart color list, ideal to use to colorize the series """
+  RED = '#F44336'
+  BLUE = '#2196F3'
+  GREEN = '#4CAF50'
+  PURPLE = '#9C27B0'
+  ORANGE = '#FF9800'
+  PINK = '#E91E63'
+  TEAL = '#009688'
+  AMBER = '#FFC107'
+  CYAN = '#00BCD4'
+  INDIGO = '#3F51B5'
+  LIME = '#CDDC39'
+
+  @property
+  def _readable(self) -> str:
+    """ Readable """
+    return f'ChartColor.{self.value}'
+
+  def __str__(self) -> str:
+    """ Readable property """
+    return self._readable
+
+  def __repr__(self) -> str:
+    """ Readable property """
+    return self._readable
+
+
+def get_color_list() -> list[str]:
+  """ Get all colors """
+  return [color.value for color in ChartColor]

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/column.py

@@ -2,7 +2,9 @@
 from layrz_sdk.helpers import convert_to_rgba
 
 from .alignment import ChartAlignment
+from .configuration import AxisConfig
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 from .serie import ChartDataSerie
 from .serie_type import ChartDataSerieType
 
@@ -19,6 +21,8 @@ class ColumnChart:
     y_axis: list[ChartDataSerie],
     title: str = 'Chart',
     align: ChartAlignment = ChartAlignment.CENTER,
+    x_axis_config: AxisConfig = None,
+    y_axis_config: AxisConfig = None,
   ) -> None:
     """
     Constructor
@@ -30,6 +34,8 @@ class ColumnChart:
                  Please read the documentation to more information.
       - title : Title of the chart
       - align : Alignment of the title
+      - x_axis_config : Configuration of the X Axis
+      - y_axis_config : Configuration of the Y Axis
     """
     for i, serie in enumerate(y_axis):
       if not isinstance(serie, ChartDataSerie):
@@ -48,7 +54,24 @@ class ColumnChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
-  def render(self, use_new_definition: bool = False) -> dict | list[dict]:
+    if x_axis_config is None:
+      x_axis_config = AxisConfig()
+
+    if not isinstance(x_axis_config, AxisConfig):
+      raise ChartException('x_axis_config must be an instance of AxisConfig')
+    self.x_axis_config = x_axis_config
+
+    if y_axis_config is None:
+      y_axis_config = AxisConfig()
+
+    if not isinstance(y_axis_config, AxisConfig):
+      raise ChartException('y_axis_config must be an instance of AxisConfig')
+    self.y_axis_config = y_axis_config
+
+  def render(
+    self,
+    technology: ChartRenderTechnology = ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS,
+  ) -> dict:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: GRAPHIC and APEXCHARTS.
@@ -56,17 +79,67 @@ class ColumnChart:
     GRAPHIC is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     APEXCHARTS is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.GRAPHIC:
       return {
         'library': 'GRAPHIC',
         'chart': 'COLUMN',
         'configuration': self._render_graphic(),
       }
 
+    if technology == ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS:
+      return {
+        'library': 'SYNCFUSION_FLUTTER_CHARTS',
+        'chart': 'COLUMN',
+        'configuration': self._render_syncfusion_flutter_charts(),
+      }
+
+    if technology == ChartRenderTechnology.APEX_CHARTS:
+      return {
+        'library': 'APEXCHARTS',
+        'chart': 'COLUMN',
+        'configuration': self._render_apexcharts(),
+      }
+
+    return {
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
+    }
+
+  def _render_syncfusion_flutter_charts(self) -> dict:
+    """
+    Converts the configuration of the chart to Syncfusion Flutter Charts.
+    """
+    series = []
+
+    for serie in self.y_axis:
+      values = []
+      for i, value in enumerate(serie.data):
+        x_axis = self.x_axis.data[i]
+        values.append({'xAxis': x_axis, 'yAxis': value})
+
+      series.append({
+        'label': serie.label,
+        'color': serie.color,
+        'values': values,
+      })
+
     return {
-      'library': 'APEXCHARTS',
-      'chart': 'COLUMN',
-      'configuration': self._render_apexcharts(),
+      'series': series,
+      'xAxis': {
+        'label': self.x_axis_config.label,
+        'measureUnit': self.x_axis_config.measure_unit,
+        'dataType': self.x_axis_config.data_type.value,
+        'minValue': self.x_axis_config.min_value,
+        'maxValue': self.x_axis_config.max_value,
+      },
+      'yAxis': {
+        'label': self.y_axis_config.label,
+        'measureUnit': self.y_axis_config.measure_unit,
+        'dataType': self.y_axis_config.data_type.value,
+        'minValue': self.y_axis_config.min_value,
+        'maxValue': self.y_axis_config.max_value,
+      },
     }
 
   def _render_graphic(self) -> list[dict]:

layrz_sdk-3.0.6/layrz_sdk/entities/charts/configuration.py

@@ -0,0 +1,53 @@
+""" Charts entities """
+from .data_type import ChartDataType
+
+
+class ChartConfiguration:
+  """
+  Chart configuration
+  """
+
+  def __init__(self, name: str, description: str) -> None:
+    """ Constructor """
+    self.name = name
+    self.description = description
+
+  @property
+  def _readable(self) -> str:
+    """ Readable """
+    return f'ChartConfiguration(name="{self.name}")'
+
+  def __str__(self) -> str:
+    """ Readable property """
+    return self._readable
+
+  def __repr__(self) -> str:
+    """ Readable property """
+    return self._readable
+
+
+class AxisConfig:
+  """ Axis configuration """
+
+  def __init__(
+    self,
+    label: str = '',
+    measure_unit: str = '',
+    min_value: int | float = None,
+    max_value: int | float = None,
+    data_type: ChartDataType = ChartDataType.DATETIME,
+  ) -> None:
+    """
+    Constructor
+    ---
+    Arguments
+      - label : Label of the axis
+      - color : Color of the axis
+      - min_value : Minimum value of the axis
+      - max_value : Maximum value of the axis
+    """
+    self.label = label
+    self.measure_unit = measure_unit
+    self.min_value = min_value
+    self.max_value = max_value
+    self.data_type = data_type

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/data_type.py

@@ -6,14 +6,14 @@ class ChartDataType(Enum):
   """
   Chart Data Type
   """
-  STRING = 'string'
-  DATETIME = 'datetime'
-  NUMBER = 'number'
+  STRING = 'STRING'
+  DATETIME = 'DATETIME'
+  NUMBER = 'NUMBER'
 
   @property
   def _readable(self) -> str:
     """ Readable """
-    return f'BroadcastStatus.{self.value}'
+    return f'ChartDataType.{self.value}'
 
   def __str__(self) -> str:
     """ Readable property """

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/line.py

@@ -1,12 +1,15 @@
 """ Line chart """
+import logging
 
 from .alignment import ChartAlignment
+from .configuration import AxisConfig
 from .data_type import ChartDataType
 from .exceptions import ChartException
 from .render_technology import ChartRenderTechnology
 from .serie import ChartDataSerie
 from .serie_type import ChartDataSerieType
 
+log = logging.getLogger(__name__)
 
 class LineChart:
   """
@@ -20,6 +23,8 @@ class LineChart:
     y_axis: list[ChartDataSerie],
     title: str = 'Chart',
     align: ChartAlignment = ChartAlignment.CENTER,
+    x_axis_config: AxisConfig = None,
+    y_axis_config: AxisConfig = None,
   ) -> None:
     """
     Constructor
@@ -31,6 +36,8 @@ class LineChart:
                  Please read the documentation to more information.
       - title : Title of the chart
       - align : Alignment of the title
+      - x_axis_config : Configuration of the X Axis
+      - y_axis_config : Configuration of the Y Axis
     """
     for i, serie in enumerate(y_axis):
       if not isinstance(serie, ChartDataSerie):
@@ -49,6 +56,20 @@ class LineChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
+    if x_axis_config is None:
+      x_axis_config = AxisConfig()
+
+    if not isinstance(x_axis_config, AxisConfig):
+      raise ChartException('x_axis_config must be an instance of AxisConfig')
+    self.x_axis_config = x_axis_config
+
+    if y_axis_config is None:
+      y_axis_config = AxisConfig()
+
+    if not isinstance(y_axis_config, AxisConfig):
+      raise ChartException('y_axis_config must be an instance of AxisConfig')
+    self.y_axis_config = y_axis_config
+
   def render(self, technology: ChartRenderTechnology) -> dict | list[dict]:
     """
     Render chart to a graphic Library.
@@ -72,13 +93,20 @@ class LineChart:
         'configuration': self._render_syncfusion_flutter_charts(),
       }
 
+    if technology == ChartRenderTechnology.CANVASJS:
+      return {
+        'library': 'CANVASJS',
+        'chart': 'LINE',
+        'configuration': self._render_canvasjs(),
+      }
+
     return {
-      'library': 'CANVASJS',
-      'chart': 'LINE',
-      'configuration': self._render_canvasjs(),
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
-  def _render_syncfusion_flutter_charts(self) -> list[dict]:
+  def _render_syncfusion_flutter_charts(self) -> dict:
     """ 
     Converts the configuration of the chart to a Flutter library syncfusion_flutter_charts.
     """
@@ -86,6 +114,7 @@ class LineChart:
 
     for serie in self.y_axis:
       if serie.serie_type not in [ChartDataSerieType.LINE, ChartDataSerieType.AREA]:
+        log.warning('Serie type not supported: %s', serie.serie_type)
         continue
 
       points = []
@@ -103,6 +132,7 @@ class LineChart:
             y_value = 0
 
         if not isinstance(y_value, (int, float)):
+          log.debug('Value isn\'t a number: %s', y_value)
           continue
 
         points.append({
@@ -117,7 +147,23 @@ class LineChart:
         'type': 'AREA' if serie.serie_type == ChartDataSerieType.AREA else 'LINE',
       })
 
-    return series
+    return {
+      'series': series,
+      'xAxis': {
+        'label': self.x_axis_config.label,
+        'measureUnit': self.x_axis_config.measure_unit,
+        'dataType': self.x_axis_config.data_type.value,
+        'minValue': self.x_axis_config.min_value,
+        'maxValue': self.x_axis_config.max_value,
+      },
+      'yAxis': {
+        'label': self.y_axis_config.label,
+        'measureUnit': self.y_axis_config.measure_unit,
+        'dataType': self.y_axis_config.data_type.value,
+        'minValue': self.y_axis_config.min_value,
+        'maxValue': self.y_axis_config.max_value,
+      },
+    }
 
   def _render_graphic(self) -> list[dict]:
     """

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/map.py

@@ -2,6 +2,7 @@
 from enum import Enum
 
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 
 
 class MapCenterType(Enum):
@@ -99,7 +100,7 @@ class MapChart:
       raise ChartException('center_latlng must be an instance of list or tuple')
     self.center_latlng = center_latlng
 
-  def render(self, use_new_definition: bool = False) -> dict:
+  def render(self, technology: ChartRenderTechnology = ChartRenderTechnology.FLUTTER_MAP) -> dict:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: FLUTTER_MAP and LEAFLET.
@@ -107,7 +108,7 @@ class MapChart:
     FLUTTER_MAP is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     LEAFLET is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.FLUTTER_MAP:
       return {
         'library': 'FLUTTER_MAP',
         'chart': 'MAP',
@@ -115,9 +116,9 @@ class MapChart:
       }
 
     return {
-      'library': 'LEAFLET',
-      'chart': 'MAP',
-      'configuration': self._render_leaflet(),
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
   def _render_flutter_map(self) -> dict:

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/number.py

@@ -1,4 +1,5 @@
 """ Number chart """
+from .render_technology import ChartRenderTechnology
 
 
 class NumberChart:
@@ -20,14 +21,21 @@ class NumberChart:
     self.color = color
     self.label = label
 
-  def render(self) -> dict:
+  def render(self, technology: ChartRenderTechnology = ChartRenderTechnology.FLUTTER) -> dict:
     """
     Render chart to a graphic Library.
     """
+    if technology == ChartRenderTechnology.FLUTTER:
+      return {
+        'library': 'FLUTTER',
+        'chart': 'NUMBER',
+        'configuration': self._render_flutter(),
+      }
+
     return {
       'library': 'FLUTTER',
-      'chart': 'NUMBER',
-      'configuration': self._render_flutter(),
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
   def _render_flutter(self) -> dict:

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/pie.py

@@ -1,6 +1,7 @@
 """ Pie chart """
 from .alignment import ChartAlignment
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 from .serie import ChartDataSerie
 
 
@@ -37,7 +38,10 @@ class PieChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
-  def render(self, use_new_definition: bool = False) -> dict | list[dict]:
+  def render(
+    self,
+    technology: ChartRenderTechnology = ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS,
+  ) -> dict | list[dict]:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: GRAPHIC and CANVASJS.
@@ -45,18 +49,48 @@ class PieChart:
     GRAPHIC is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     CANVASJS is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.GRAPHIC:
       return {
         'library': 'GRAPHIC',
         'chart': 'PIE',
         'configuration': self._render_graphic(),
       }
+
+    if technology == ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS:
+      return {
+        'library': 'SYNCFUSION_FLUTTER_CHARTS',
+        'chart': 'PIE',
+        'configuration': self._render_syncfusion_flutter_charts(),
+      }
+
+    if technology == ChartRenderTechnology.APEX_CHARTS:
+      return {
+        'library': 'APEXCHARTS',
+        'chart': 'PIE',
+        'configuration': self._render_apexcharts(),
+      }
+
     return {
-      'library': 'APEXCHARTS',
-      'chart': 'PIE',
-      'configuration': self._render_apexcharts(),
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
+  def _render_syncfusion_flutter_charts(self) -> dict:
+    """
+    Converts the configuration of the chart to Syncfusion Flutter Charts.
+    """
+    series = []
+
+    for serie in self.series:
+      series.append({
+        'label': serie.label,
+        'color': serie.color,
+        'value': serie.data[0],
+      })
+
+    return {'series': series}
+
   def _render_graphic(self) -> list[dict]:
     """
     Converts the configuration of the chart to a Flutter library Graphic.

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/radial_bar.py

@@ -1,6 +1,7 @@
 """ Radial Bar chart """
 from .alignment import ChartAlignment
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 from .serie import ChartDataSerie
 
 
@@ -37,7 +38,10 @@ class RadialBarChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
-  def render(self, use_new_definition: bool = False) -> dict | list[dict]:
+  def render(
+    self,
+    technology: ChartRenderTechnology = ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS,
+  ) -> dict | list[dict]:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: GRAPHIC and CANVASJS.
@@ -45,18 +49,48 @@ class RadialBarChart:
     GRAPHIC is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     CANVASJS is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.GRAPHIC:
       return {
         'library': 'GRAPHIC',
         'chart': 'RADIALBAR',
         'configuration': self._render_graphic(),
       }
+
+    if technology == ChartRenderTechnology.APEX_CHARTS:
+      return {
+        'library': 'APEXCHARTS',
+        'chart': 'RADIALBAR',
+        'configuration': self._render_apexcharts(),
+      }
+
+    if technology == ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS:
+      return {
+        'library': 'SYNCFUSION_FLUTTER_CHARTS',
+        'chart': 'RADIALBAR',
+        'configuration': self._render_syncfusion_flutter_charts(),
+      }
+
     return {
-      'library': 'APEXCHARTS',
-      'chart': 'RADIALBAR',
-      'configuration': self._render_apexcharts(),
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
+  def _render_syncfusion_flutter_charts(self) -> dict:
+    """
+    Converts the configuration of the chart to Syncfusion Flutter Charts.
+    """
+    series = []
+
+    for serie in self.series:
+      series.append({
+        'label': serie.label,
+        'color': serie.color,
+        'value': serie.data[0],
+      })
+
+    return {'series': series}
+
   def _render_graphic(self) -> list[dict]:
     """
     Converts the configuration of the chart to a Flutter library Graphic.

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/render_technology.py

@@ -9,6 +9,9 @@ class ChartRenderTechnology(Enum):
   CANVAS_JS = 'CANVAS_JS'
   GRAPHIC = 'GRAPHIC'
   SYNCFUSION_FLUTTER_CHARTS = 'SYNCFUSION_FLUTTER_CHARTS'
+  FLUTTER_MAP = 'FLUTTER_MAP'
+  APEX_CHARTS = 'APEX_CHARTS'
+  FLUTTER = 'FLUTTER'
 
   @property
   def _readable(self) -> str:

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/scatter.py

@@ -1,6 +1,8 @@
 """ Scatter chart """
 from .alignment import ChartAlignment
+from .configuration import AxisConfig
 from .exceptions import ChartException
+from .render_technology import ChartRenderTechnology
 from .serie_type import ChartDataSerieType
 
 
@@ -70,6 +72,8 @@ class ScatterChart:
     series: list[ScatterSerie],
     title: str = 'Chart',
     align: ChartAlignment = ChartAlignment.CENTER,
+    x_axis_config: AxisConfig = None,
+    y_axis_config: AxisConfig = None,
   ) -> None:
     """
     Constructor
@@ -93,7 +97,24 @@ class ScatterChart:
       raise ChartException('align must be an instance of ChartAlignment')
     self.align = align
 
-  def render(self, use_new_definition: bool = False) -> dict | list[dict]:
+    if x_axis_config is None:
+      x_axis_config = AxisConfig(label='', measure_unit='')
+
+    if not isinstance(x_axis_config, AxisConfig):
+      raise ChartException('x_axis_config must be an instance of AxisConfig')
+    self.x_axis_config = x_axis_config
+
+    if y_axis_config is None:
+      y_axis_config = AxisConfig(label='', measure_unit='')
+
+    if not isinstance(y_axis_config, AxisConfig):
+      raise ChartException('y_axis_config must be an instance of AxisConfig')
+    self.y_axis_config = y_axis_config
+
+  def render(
+    self,
+    technology: ChartRenderTechnology = ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS,
+  ) -> dict:
     """
     Render chart to a graphic Library.
     We have two graphic libraries: GRAPHIC and APEXCHARTS.
@@ -101,17 +122,85 @@ class ScatterChart:
     GRAPHIC is a Flutter chart library. To return this option, use the parameter use_new_definition=True.
     APEXCHARTS is a Javascript chart library. This is the default option.
     """
-    if use_new_definition:
+    if technology == ChartRenderTechnology.GRAPHIC:
       return {
         'library': 'GRAPHIC',
         'chart': 'SCATTER',
         'configuration': self._render_graphic(),
       }
 
+    if technology == ChartRenderTechnology.SYNCFUSION_FLUTTER_CHARTS:
+      return {
+        'library': 'SYNCFUSION_FLUTTER_CHARTS',
+        'chart': 'SCATTER',
+        'configuration': self._render_syncfusion_flutter_charts(),
+      }
+
+    if technology == ChartRenderTechnology.APEX_CHARTS:
+      return {
+        'library': 'APEXCHARTS',
+        'chart': 'SCATTER',
+        'configuration': self._render_apexcharts(),
+      }
+
     return {
-      'library': 'APEXCHARTS',
-      'chart': 'SCATTER',
-      'configuration': self._render_apexcharts(),
+      'library': 'FLUTTER',
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
+    }
+
+  def _render_syncfusion_flutter_charts(self) -> dict:
+    """
+    Converts the configuration of the chart to Flutter library Graphic.
+    """
+    series = []
+    for serie in self.series:
+      data = []
+
+      type_serie = 'SCATTER'
+      if serie.serie_type == ChartDataSerieType.SCATTER:
+        type_serie = 'SCATTER'
+      elif serie.serie_type == ChartDataSerieType.LINE:
+        type_serie = 'LINE'
+      elif serie.serie_type == ChartDataSerieType.AREA:
+        type_serie = 'AREA'
+      else:
+        continue
+
+      for item in serie.data:
+        if not isinstance(item.x, (int, float)):
+          continue
+        if not isinstance(item.y, (int, float)):
+          continue
+
+        data.append({
+          'xAxis': item.x,
+          'yAxis': item.y,
+        })
+
+      series.append({
+        'label': serie.label,
+        'color': serie.color,
+        'values': data,
+        'type': type_serie,
+      })
+
+    return {
+      'series': series,
+      'xAxis': {
+        'label': self.x_axis_config.label,
+        'measureUnit': self.x_axis_config.measure_unit,
+        'dataType': self.x_axis_config.data_type.value,
+        'minValue': self.x_axis_config.min_value,
+        'maxValue': self.x_axis_config.max_value,
+      },
+      'yAxis': {
+        'label': self.y_axis_config.label,
+        'measureUnit': self.y_axis_config.measure_unit,
+        'dataType': self.y_axis_config.data_type.value,
+        'minValue': self.y_axis_config.min_value,
+        'maxValue': self.y_axis_config.max_value,
+      },
     }
 
   def _render_graphic(self) -> list[dict]:

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/serie.py

@@ -14,7 +14,7 @@ class ChartDataSerie:
     data: list[float | int | bool],
     color: str = '#000000',
     label: str = '',
-    serie_type: ChartDataSerieType = ChartDataSerieType.NONE,
+    serie_type: ChartDataSerieType = ChartDataSerieType.LINE,
     data_type: ChartDataType = ChartDataType.NUMBER,
     dashed: bool = False,
   ):

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk/entities/charts/table.py

@@ -1,4 +1,5 @@
 """ Number chart """
+from .render_technology import ChartRenderTechnology
 
 
 class TableHeader:
@@ -43,14 +44,21 @@ class TableChart:
     self.columns = columns
     self.rows = rows
 
-  def render(self) -> dict:
+  def render(self, technology: ChartRenderTechnology = ChartRenderTechnology.FLUTTER) -> dict:
     """
     Render chart to a graphic Library.
     """
+    if technology == ChartRenderTechnology.FLUTTER:
+      return {
+        'library': 'FLUTTER',
+        'chart': 'TABLE',
+        'configuration': self._render_flutter(),
+      }
+
     return {
       'library': 'FLUTTER',
-      'chart': 'TABLE',
-      'configuration': self._render_flutter(),
+      'chart': 'TEXT',
+      'configuration': [f'Unsupported {technology}'],
     }
 
   def _render_flutter(self) -> dict:

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layrz-sdk
-Version: 3.0.4
+Version: 3.0.6
 Summary: Layrz SDK for Python
 Author-email: "Golden M, Inc." <software@goldenm.com>
 Maintainer-email: Kenny Mochizuki <kenny@goldenm.com>, Luis Reyes <lreyes@goldenm.com>, Kasen Li <kli@goldenm.com>

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/layrz_sdk.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ layrz_sdk/entities/cases/trigger.py
 layrz_sdk/entities/charts/__init__.py
 layrz_sdk/entities/charts/alignment.py
 layrz_sdk/entities/charts/bar.py
+layrz_sdk/entities/charts/color.py
 layrz_sdk/entities/charts/column.py
 layrz_sdk/entities/charts/configuration.py
 layrz_sdk/entities/charts/data_type.py

{layrz_sdk-3.0.4 → layrz_sdk-3.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "layrz-sdk"
-version = "3.0.4"
+version = "3.0.6"
 description = "Layrz SDK for Python"
 authors = [
   {name = "Golden M, Inc.", email = "software@goldenm.com"}

layrz_sdk-3.0.4/layrz_sdk/entities/charts/configuration.py

@@ -1,25 +0,0 @@
-""" Charts entities """
-
-
-class ChartConfiguration:
-  """
-  Chart configuration
-  """
-
-  def __init__(self, name: str, description: str) -> None:
-    """ Constructor """
-    self.name = name
-    self.description = description
-
-  @property
-  def _readable(self) -> str:
-    """ Readable """
-    return f'ChartConfiguration(name="{self.name}")'
-
-  def __str__(self) -> str:
-    """ Readable property """
-    return self._readable
-
-  def __repr__(self) -> str:
-    """ Readable property """
-    return self._readable