Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@
## [ES] Cliente Python (NO OFICIAL) para i-DE (Iberdrola distribución).
### Instalación:

#### Requests support:

```
pip install oligo
pip install oligo[requests]
```

#### Async support:

```
pip install oligo[asyncio]
```

### Ejemplos:

#### Consultar consumo actual (Sync):
Expand Down
4 changes: 2 additions & 2 deletions demo/arduino_watthourmeter.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import PyCmdMessenger
import time
from oligo import iber
from oligo import Iber

arduino = PyCmdMessenger.ArduinoBoard("/dev/ttyACM0", baud_rate=9600)
commands = [["watt", "d"]]
c = PyCmdMessenger.CmdMessenger(arduino, commands)

connection = iber.Iber()
connection = Iber()
connection.login("user", "password")

while True:
Expand Down
7 changes: 6 additions & 1 deletion oligo/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
from .iber import Iber
from sys import stderr

try:
from .requests.iber import Iber
except ImportError as error:
print(error.message, file=stderr)
4 changes: 2 additions & 2 deletions oligo/asyncio/asynciber.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from oligo.exception import SessionException, ResponseException, NoResponseException, LoginException, \
from ..exception import SessionException, ResponseException, NoResponseException, LoginException, \
SelectContractException

try:
import aiohttp
except ImportError:
raise RuntimeError("AsyncIber requires aiohttp")
raise RuntimeError("AsyncIber requires aiohttp module")

from datetime import datetime
from typing import Union, Optional
Expand Down
1 change: 1 addition & 0 deletions oligo/requests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .iber import Iber
8 changes: 6 additions & 2 deletions oligo/iber.py → oligo/requests/iber.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from datetime import datetime

from requests import Session
try:
from requests import Session
except ImportError:
raise RuntimeError("Iber requires requests module")

from .exception import LoginException, ResponseException, NoResponseException, SelectContractException, SessionException
from ..exception import LoginException, ResponseException, NoResponseException, SelectContractException, \
SessionException


class Iber:
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
long_description_content_type="text/markdown",
url="https://github.com/hectorespert/python-oligo",
packages=find_packages(),
install_requires=[
'requests'
],
install_requires=[],
extras_require={
'requests': ['requests'],
'asyncio': ['aiohttp']
},
classifiers=[
Expand Down